refactor: Add null unwrapping to silence already handled nullability warnings

philprime · philprime · commit dcf28a27fc93 · 2025-07-29T16:12:07.000+02:00
diff --git a/Sources/Sentry/PrivateSentrySDKOnly.m b/Sources/Sentry/PrivateSentrySDKOnly.m
@@ -292,7 +292,7 @@ + (SentryScreenFrames *)currentScreenFrames
 }
 
 #if SENTRY_UIKIT_AVAILABLE
-+ (void)setCurrentScreen:(NSString *)screenName
++ (void)setCurrentScreen:(NSString *_Nullable)screenName
 {
     [SentrySDKInternal.currentHub
         configureScope:^(SentryScope *scope) { scope.currentScreen = screenName; }];
diff --git a/Sources/Sentry/Processors/SentryWatchdogTerminationBreadcrumbProcessor.m b/Sources/Sentry/Processors/SentryWatchdogTerminationBreadcrumbProcessor.m
@@ -44,7 +44,7 @@ - (void)addSerializedBreadcrumb:(NSDictionary *)crumb
         SENTRY_LOG_ERROR(@"Error serializing breadcrumb to JSON");
         return;
     }
-    [self storeBreadcrumb:jsonData];
+    [self storeBreadcrumb:SENTRY_UNWRAP_NULLABLE(NSData, jsonData)];
 }
 
 - (void)clear
diff --git a/Sources/Sentry/Public/SentryDefines.h b/Sources/Sentry/Public/SentryDefines.h
@@ -220,3 +220,6 @@ typedef void (^SentryUserFeedbackConfigurationBlock)(
  *  pattern in the codebase.
  */
 #define SENTRY_UNWRAP_NULLABLE(type, nullable_var) (type *_Nonnull)(nullable_var)
+#define SENTRY_UNWRAP_NULLABLE_VALUE(type, nullable_var) (type _Nonnull)(nullable_var)
+#define SENTRY_UNWRAP_NULLABLE_DICT(key, value, nullable_var)                                      \
+    (NSDictionary<key, value> *_Nonnull)(nullable_var)
diff --git a/Sources/Sentry/SentryBinaryImageCache.m b/Sources/Sentry/SentryBinaryImageCache.m
@@ -176,7 +176,7 @@ - (NSInteger)indexOfImage:(uint64_t)address
 - (NSArray<SentryBinaryImageInfo *> *)getAllBinaryImages
 {
     @synchronized(self) {
-        return _cache.copy;
+        return SENTRY_UNWRAP_NULLABLE(NSArray<SentryBinaryImageInfo *>, _cache.copy);
     }
 }
 
diff --git a/Sources/Sentry/SentryBreadcrumb.m b/Sources/Sentry/SentryBreadcrumb.m
@@ -75,7 +75,7 @@ - (BOOL)isEqual:(id _Nullable)other
     if (!other || ![[other class] isEqual:[self class]])
         return NO;
 
-    return [self isEqualToBreadcrumb:other];
+    return [self isEqualToBreadcrumb:SENTRY_UNWRAP_NULLABLE(SentryBreadcrumb, other)];
 }
 
 - (BOOL)isEqualToBreadcrumb:(SentryBreadcrumb *)breadcrumb
diff --git a/Sources/Sentry/SentryBreadcrumbTracker.m b/Sources/Sentry/SentryBreadcrumbTracker.m
@@ -316,12 +316,14 @@ + (NSDictionary *)fetchInfoAboutViewController:(UIViewController *)controller
 
     if (controller.presentingViewController != nil) {
         info[@"presentingViewController"] =
-            [SwiftDescriptor getViewControllerClassName:controller.presentingViewController];
+            [SwiftDescriptor getViewControllerClassName:SENTRY_UNWRAP_NULLABLE(UIViewController,
+                                                            controller.presentingViewController)];
     }
 
     if (controller.parentViewController != nil) {
         info[@"parentViewController"] =
-            [SwiftDescriptor getViewControllerClassName:controller.parentViewController];
+            [SwiftDescriptor getViewControllerClassName:SENTRY_UNWRAP_NULLABLE(UIViewController,
+                                                            controller.parentViewController)];
     }
 
     if (controller.view.window != nil) {
diff --git a/Sources/Sentry/SentryCoreDataTracker.m b/Sources/Sentry/SentryCoreDataTracker.m
@@ -204,7 +204,8 @@ - (NSString *)descriptionFromRequest:(NSFetchRequest *)request
 
     if (request.predicate) {
         [result appendFormat:@" WHERE %@",
-            [predicateDescriptor predicateDescription:request.predicate]];
+            [predicateDescriptor
+                predicateDescription:SENTRY_UNWRAP_NULLABLE(NSPredicate, request.predicate)]];
     }
 
     if (request.sortDescriptors.count > 0) {
diff --git a/Sources/Sentry/SentryCrashIntegrationSessionHandler.m b/Sources/Sentry/SentryCrashIntegrationSessionHandler.m
@@ -81,7 +81,8 @@ - (void)endCurrentSessionIfRequired
             return;
         }
 
-        [session endSessionAbnormalWithTimestamp:appHangEvent.timestamp];
+        [session
+            endSessionAbnormalWithTimestamp:SENTRY_UNWRAP_NULLABLE(NSDate, appHangEvent).timestamp];
         [fileManager storeAbnormalSession:session];
         [fileManager deleteCurrentSession];
     }
diff --git a/Sources/Sentry/SentryDateUtil.m b/Sources/Sentry/SentryDateUtil.m
@@ -24,7 +24,8 @@ - (BOOL)isInFuture:(NSDate *_Nullable)date
     if (date == nil)
         return NO;
 
-    NSComparisonResult result = [[self.currentDateProvider date] compare:date];
+    NSComparisonResult result =
+        [[self.currentDateProvider date] compare:SENTRY_UNWRAP_NULLABLE(NSDate, date)];
     return result == NSOrderedAscending;
 }
 
@@ -37,7 +38,8 @@ + (NSDate *_Nullable)getMaximumDate:(NSDate *_Nullable)first andOther:(NSDate *_
     if (second == nil)
         return first;
 
-    NSComparisonResult result = [first compare:second];
+    NSComparisonResult result =
+        [SENTRY_UNWRAP_NULLABLE(NSDate, first) compare:SENTRY_UNWRAP_NULLABLE(NSDate, second)];
     if (result == NSOrderedDescending) {
         return first;
     } else {
diff --git a/Sources/Sentry/SentryDebugImageProvider.m b/Sources/Sentry/SentryDebugImageProvider.m
@@ -67,7 +67,7 @@ - (void)extractDebugImageAddressFromFrames:(NSArray<SentryFrame *> *)frames
 {
     for (SentryFrame *frame in frames) {
         if (frame.imageAddress) {
-            [set addObject:frame.imageAddress];
+            [set addObject:SENTRY_UNWRAP_NULLABLE(NSString, frame.imageAddress)];
         }
     }
 }
@@ -85,7 +85,8 @@ - (void)extractDebugImageAddressFromFrames:(NSArray<SentryFrame *> *)frames
 #    pragma clang diagnostic pop
 
     for (SentryDebugMeta *sourceImage in binaryImages) {
-        if ([addresses containsObject:sourceImage.imageAddress]) {
+        if (sourceImage.imageAddress &&
+            [addresses containsObject:SENTRY_UNWRAP_NULLABLE(NSString, sourceImage.imageAddress)]) {
             [result addObject:sourceImage];
         }
     }
diff --git a/Sources/Sentry/SentryDefaultRateLimits.m b/Sources/Sentry/SentryDefaultRateLimits.m
@@ -61,7 +61,8 @@ - (void)update:(NSHTTPURLResponse *)response
             SentryDataCategory category
                 = sentryDataCategoryForNSUInteger(categoryAsNumber.unsignedIntegerValue);
 
-            [self updateRateLimit:category withDate:limits[categoryAsNumber]];
+            [self updateRateLimit:category
+                         withDate:SENTRY_UNWRAP_NULLABLE(NSDate, limits[categoryAsNumber])];
         }
     } else if (response.statusCode == 429) {
         NSDate *retryAfterHeaderDate =
diff --git a/Sources/Sentry/SentryDsn.m b/Sources/Sentry/SentryDsn.m
@@ -19,10 +19,11 @@ - (_Nullable instancetype)initWithString:(NSString *)dsnString
 {
     self = [super init];
     if (self) {
-        _url = [self convertDsnString:dsnString didFailWithError:error];
-        if (_url == nil) {
+        NSURL *_Nullable nullableUrl = [self convertDsnString:dsnString didFailWithError:error];
+        if (nullableUrl == nil) {
             return nil;
         }
+        _url = SENTRY_UNWRAP_NULLABLE(NSURL, nullableUrl);
     }
     return self;
 }
@@ -102,7 +103,7 @@ - (NSURL *_Nullable)convertDsnString:(NSString *)dsnString
         errorMessage = @"URL scheme of DSN is missing";
         url = nil;
     }
-    if (url != nil && ![allowedSchemes containsObject:url.scheme]) {
+    if (url != nil && ![allowedSchemes containsObject:SENTRY_UNWRAP_NULLABLE(NSURL, url).scheme]) {
         errorMessage = @"Unrecognized URL scheme in DSN";
         url = nil;
     }
diff --git a/Sources/Sentry/SentryEvent.m b/Sources/Sentry/SentryEvent.m
@@ -203,7 +203,8 @@ - (BOOL)isMetricKitEvent
 
     SentryException *exception = self.exceptions[0];
     if (exception.mechanism != nil &&
-        [metricKitMechanisms containsObject:exception.mechanism.type]) {
+        [metricKitMechanisms
+            containsObject:SENTRY_UNWRAP_NULLABLE(NSString, exception.mechanism).type]) {
         return YES;
     } else {
         return NO;
@@ -216,7 +217,9 @@ - (BOOL)isAppHangEvent
 {
     return self.exceptions.count == 1 &&
         [SentryAppHangTypeMapper
-            isExceptionTypeAppHangWithExceptionType:self.exceptions.firstObject.type];
+            isExceptionTypeAppHangWithExceptionType:SENTRY_UNWRAP_NULLABLE(
+                                                        NSString, self.exceptions.firstObject)
+                                                        .type];
 }
 
 @end
diff --git a/Sources/Sentry/SentryGeo.m b/Sources/Sentry/SentryGeo.m
@@ -46,7 +46,7 @@ - (BOOL)isEqual:(id _Nullable)other
         return NO;
     }
 
-    return [self isEqualToGeo:other];
+    return [self isEqualToGeo:SENTRY_UNWRAP_NULLABLE(SentryGeo, other)];
 }
 
 - (BOOL)isEqualToGeo:(SentryGeo *)geo
diff --git a/Sources/Sentry/SentryHttpTransport.m b/Sources/Sentry/SentryHttpTransport.m
@@ -377,7 +377,7 @@ - (void)deleteEnvelopeAndSendNext:(nullable NSString *)envelopePath
 {
     SENTRY_LOG_DEBUG(@"Deleting envelope and sending next.");
     if (envelopePath != nil) {
-        [self.fileManager removeFileAtPath:envelopePath];
+        [self.fileManager removeFileAtPath:SENTRY_UNWRAP_NULLABLE(NSString, envelopePath)];
     }
     @synchronized(self) {
         self.isSending = NO;
@@ -417,7 +417,7 @@ - (void)sendEnvelope:(SentryEnvelope *)envelope
                 return;
             }
 
-            [weakSelf.rateLimits update:response];
+            [weakSelf.rateLimits update:SENTRY_UNWRAP_NULLABLE(NSHTTPURLResponse, response)];
 
             if (response.statusCode == 200) {
                 SENTRY_LOG_DEBUG(@"Envelope sent successfully!");
diff --git a/Sources/Sentry/SentryHub.m b/Sources/Sentry/SentryHub.m
@@ -194,7 +194,7 @@ - (void)closeCachedSessionWithTimestamp:(nullable NSDate *)timestamp
             [session endSessionAbnormalWithTimestamp:timestamp];
         } else {
             SENTRY_LOG_DEBUG(@"Closing cached session as exited.");
-            [session endSessionExitedWithTimestamp:timestamp];
+            [session endSessionExitedWithTimestamp:SENTRY_UNWRAP_NULLABLE(NSDate, timestamp)];
         }
         [self deleteCurrentSession];
         [client captureSession:session];
diff --git a/Sources/Sentry/SentryRetryAfterHeaderParser.m b/Sources/Sentry/SentryRetryAfterHeaderParser.m
@@ -35,7 +35,8 @@ - (NSDate *_Nullable)parse:(NSString *_Nullable)retryAfterHeader
     }
 
     // parsing as double/seconds failed, try to parse as date
-    NSDate *retryAfterDate = [self.httpDateParser dateFromString:retryAfterHeader];
+    NSDate *retryAfterDate =
+        [self.httpDateParser dateFromString:SENTRY_UNWRAP_NULLABLE(NSString, retryAfterHeader)];
 
     return retryAfterDate;
 }
diff --git a/Sources/Sentry/SentryScope.m b/Sources/Sentry/SentryScope.m
@@ -1,6 +1,7 @@
 #import "NSMutableDictionary+Sentry.h"
 #import "SentryAttachment+Private.h"
 #import "SentryBreadcrumb.h"
+#import "SentryDefines.h"
 #import "SentryEnvelopeItemType.h"
 #import "SentryEvent+Private.h"
 #import "SentryLevelMapper.h"
@@ -287,7 +288,8 @@ - (void)setExtras:(NSDictionary<NSString *, id> *_Nullable)extras
         return;
     }
     @synchronized(_extraDictionary) {
-        [_extraDictionary addEntriesFromDictionary:extras];
+        [_extraDictionary
+            addEntriesFromDictionary:SENTRY_UNWRAP_NULLABLE_DICT(NSString *, id, extras)];
 
         for (id<SentryScopeObserver> observer in self.observers) {
             [observer setExtras:_extraDictionary];
@@ -330,7 +332,8 @@ - (void)setTags:(NSDictionary<NSString *, NSString *> *_Nullable)tags
         return;
     }
     @synchronized(_tagDictionary) {
-        [_tagDictionary addEntriesFromDictionary:tags];
+        [_tagDictionary
+            addEntriesFromDictionary:SENTRY_UNWRAP_NULLABLE_DICT(NSString *, NSString *, tags)];
 
         for (id<SentryScopeObserver> observer in self.observers) {
             [observer setTags:_tagDictionary];
@@ -379,7 +382,8 @@ - (void)setFingerprint:(NSArray<NSString *> *_Nullable)fingerprint
     @synchronized(_fingerprintArray) {
         [_fingerprintArray removeAllObjects];
         if (fingerprint != nil) {
-            [_fingerprintArray addObjectsFromArray:fingerprint];
+            [_fingerprintArray
+                addObjectsFromArray:SENTRY_UNWRAP_NULLABLE(NSArray<NSString *>, fingerprint)];
         }
 
         for (id<SentryScopeObserver> observer in self.observers) {
@@ -542,7 +546,8 @@ - (SentryEvent *__nullable)applyToEvent:(SentryEvent *)event
     } else {
         NSMutableDictionary *newTags = [NSMutableDictionary new];
         [newTags addEntriesFromDictionary:[self tags]];
-        [newTags addEntriesFromDictionary:event.tags];
+        [newTags addEntriesFromDictionary:SENTRY_UNWRAP_NULLABLE_DICT(
+                                              NSString *, NSString *, event.tags)];
         event.tags = newTags;
     }
 
@@ -551,7 +556,8 @@ - (SentryEvent *__nullable)applyToEvent:(SentryEvent *)event
     } else {
         NSMutableDictionary *newExtra = [NSMutableDictionary new];
         [newExtra addEntriesFromDictionary:[self extras]];
-        [newExtra addEntriesFromDictionary:event.extra];
+        [newExtra
+            addEntriesFromDictionary:SENTRY_UNWRAP_NULLABLE_DICT(NSString *, id, event.extra)];
         event.extra = newExtra;
     }
 
@@ -609,7 +615,9 @@ - (SentryEvent *__nullable)applyToEvent:(SentryEvent *)event
 
     NSMutableDictionary *newContext = [self context].mutableCopy;
     if (event.context != nil) {
-        [SentryDictionary mergeEntriesFromDictionary:event.context intoDictionary:newContext];
+        [SentryDictionary mergeEntriesFromDictionary:SENTRY_UNWRAP_NULLABLE_DICT(
+                                                         NSString *, NSDictionary *, event.context)
+                                      intoDictionary:newContext];
     }
 
     newContext[@"trace"] = [self buildTraceContext:span];
@@ -626,7 +634,7 @@ - (void)addObserver:(id<SentryScopeObserver>)observer
 - (NSDictionary *)buildTraceContext:(nullable id<SentrySpan>)span
 {
     if (span != nil) {
-        return [span serialize];
+        return [SENTRY_UNWRAP_NULLABLE_VALUE(id<SentrySpan>, span) serialize];
     } else {
         return [self.propagationContext traceContextForEvent];
     }
diff --git a/Sources/Sentry/SentrySpotlightTransport.m b/Sources/Sentry/SentrySpotlightTransport.m
@@ -64,9 +64,10 @@ - (void)sendEnvelope:(SentryEnvelope *)envelope
                                                                       items:allowedEnvelopeItems];
 
     NSError *requestError = nil;
-    NSURLRequest *request = [self.requestBuilder createEnvelopeRequest:envelopeToSend
-                                                                   url:self.apiURL
-                                                      didFailWithError:&requestError];
+    NSURLRequest *request =
+        [self.requestBuilder createEnvelopeRequest:envelopeToSend
+                                               url:SENTRY_UNWRAP_NULLABLE(NSURL, self.apiURL)
+                                  didFailWithError:&requestError];
 
     if (nil == request || nil != requestError) {
         if (nil != requestError) {
diff --git a/Sources/Sentry/SentryTracer.m b/Sources/Sentry/SentryTracer.m
@@ -145,7 +145,7 @@ - (instancetype)initWithTransactionContext:(SentryTransactionContext *)transacti
 #if SENTRY_HAS_UIKIT
     [hub configureScope:^(SentryScope *scope) {
         if (scope.currentScreen != nil) {
-            self->viewNames = @[ scope.currentScreen ];
+            self->viewNames = @[ SENTRY_UNWRAP_NULLABLE(NSString, scope.currentScreen) ];
         }
     }];
 
@@ -751,12 +751,14 @@ - (SentryTransaction *)toTransaction
 
     NSMutableArray *framesOfAllSpans = [NSMutableArray array];
     if ([(SentrySpan *)self frames]) {
-        [framesOfAllSpans addObjectsFromArray:[(SentrySpan *)self frames]];
+        [framesOfAllSpans addObjectsFromArray:SENTRY_UNWRAP_NULLABLE(NSArray<SentryFrame *>,
+                                                  [(SentrySpan *)self frames])];
     }
 
     for (SentrySpan *span in spans) {
         if (span.frames) {
-            [framesOfAllSpans addObjectsFromArray:span.frames];
+            [framesOfAllSpans
+                addObjectsFromArray:SENTRY_UNWRAP_NULLABLE(NSArray<SentryFrame *>, span.frames)];
         }
     }
 
diff --git a/Sources/Sentry/SentryTransaction.m b/Sources/Sentry/SentryTransaction.m
@@ -56,7 +56,8 @@ - (instancetype)initWithTrace:(SentryTracer *)trace children:(NSArray<id<SentryS
     if (serializedData[@"tags"] != nil &&
         [serializedData[@"tags"] isKindOfClass:NSDictionary.class]) {
         NSMutableDictionary *tags = [NSMutableDictionary new];
-        [tags addEntriesFromDictionary:serializedData[@"tags"]];
+        [tags
+            addEntriesFromDictionary:SENTRY_UNWRAP_NULLABLE(NSDictionary, serializedData[@"tags"])];
         [tags addEntriesFromDictionary:traceTags];
         serializedData[@"tags"] = tags;
     } else {
@@ -69,7 +70,8 @@ - (instancetype)initWithTrace:(SentryTracer *)trace children:(NSArray<id<SentryS
     if (serializedData[@"extra"] != nil &&
         [serializedData[@"extra"] isKindOfClass:NSDictionary.class]) {
         NSMutableDictionary *extra = [NSMutableDictionary new];
-        [extra addEntriesFromDictionary:serializedData[@"extra"]];
+        [extra addEntriesFromDictionary:SENTRY_UNWRAP_NULLABLE(
+                                            NSDictionary, serializedData[@"extra"])];
         [extra addEntriesFromDictionary:traceData];
         serializedData[@"extra"] = extra;
     } else {
diff --git a/Sources/Sentry/SentryUIEventTracker.m b/Sources/Sentry/SentryUIEventTracker.m
@@ -67,14 +67,14 @@ - (void)sendActionCallback:(NSString *)action
     // which is unacceptable for a transaction name. Ideally, we should somehow shorten
     // the long name.
 
-    NSString *targetClass = NSStringFromClass([target class]);
+    NSString *targetClass = NSStringFromClass([SENTRY_UNWRAP_NULLABLE_VALUE(Class, target) class]);
     if ([targetClass containsString:@"SwiftUI"]) {
         SENTRY_LOG_DEBUG(@"Won't record transaction for SwiftUI target event.");
         return;
     }
 
     NSString *actionName = [self getTransactionName:action target:targetClass];
-    NSString *operation = [self getOperation:sender];
+    NSString *operation = [self getOperation:SENTRY_UNWRAP_NULLABLE_VALUE(id, sender)];
 
     NSString *accessibilityIdentifier = nil;
     if (_reportAccessibilityIdentifier && [[sender class] isSubclassOfClass:[UIView class]]) {
diff --git a/Sources/Sentry/SentryUIViewControllerPerformanceTracker.m b/Sources/Sentry/SentryUIViewControllerPerformanceTracker.m
diff --git a/Sources/Sentry/SentryUser.m b/Sources/Sentry/SentryUser.m
diff --git a/Sources/Sentry/SentryWatchdogTerminationLogic.m b/Sources/Sentry/SentryWatchdogTerminationLogic.m

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ + (SentryScreenFrames *)currentScreenFrames`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`#if SENTRY_UIKIT_AVAILABLE`
`295`		`-+ (void)setCurrentScreen:(NSString *)screenName`
	`295`	`++ (void)setCurrentScreen:(NSString *_Nullable)screenName`
`296`	`296`	`{`
`297`	`297`	`[SentrySDKInternal.currentHub`
`298`	`298`	`configureScope:^(SentryScope *scope) { scope.currentScreen = screenName; }];`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ - (void)addSerializedBreadcrumb:(NSDictionary *)crumb`
`44`	`44`	`SENTRY_LOG_ERROR(@"Error serializing breadcrumb to JSON");`
`45`	`45`	`return;`
`46`	`46`	`}`
`47`		`- [self storeBreadcrumb:jsonData];`
	`47`	`+ [self storeBreadcrumb:SENTRY_UNWRAP_NULLABLE(NSData, jsonData)];`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`- (void)clear`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ - (NSInteger)indexOfImage:(uint64_t)address`
`176`	`176`	`- (NSArray<SentryBinaryImageInfo > )getAllBinaryImages`
`177`	`177`	`{`
`178`	`178`	`@synchronized(self) {`
`179`		`- return _cache.copy;`
	`179`	`+ return SENTRY_UNWRAP_NULLABLE(NSArray<SentryBinaryImageInfo *>, _cache.copy);`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ - (BOOL)isEqual:(id _Nullable)other`
`75`	`75`	`if (!other \|\| ![[other class] isEqual:[self class]])`
`76`	`76`	`return NO;`
`77`	`77`
`78`		`- return [self isEqualToBreadcrumb:other];`
	`78`	`+ return [self isEqualToBreadcrumb:SENTRY_UNWRAP_NULLABLE(SentryBreadcrumb, other)];`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`- (BOOL)isEqualToBreadcrumb:(SentryBreadcrumb *)breadcrumb`
Original file line number	Diff line number	Diff line change
`@@ -316,12 +316,14 @@ + (NSDictionary )fetchInfoAboutViewController:(UIViewController )controller`
`316`	`316`
`317`	`317`	`if (controller.presentingViewController != nil) {`
`318`	`318`	`info[@"presentingViewController"] =`
`319`		`- [SwiftDescriptor getViewControllerClassName:controller.presentingViewController];`
	`319`	`+ [SwiftDescriptor getViewControllerClassName:SENTRY_UNWRAP_NULLABLE(UIViewController,`
	`320`	`+ controller.presentingViewController)];`
`320`	`321`	`}`
`321`	`322`
`322`	`323`	`if (controller.parentViewController != nil) {`
`323`	`324`	`info[@"parentViewController"] =`
`324`		`- [SwiftDescriptor getViewControllerClassName:controller.parentViewController];`
	`325`	`+ [SwiftDescriptor getViewControllerClassName:SENTRY_UNWRAP_NULLABLE(UIViewController,`
	`326`	`+ controller.parentViewController)];`
`325`	`327`	`}`
`326`	`328`
`327`	`329`	`if (controller.view.window != nil) {`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,8 @@ - (NSString )descriptionFromRequest:(NSFetchRequest )request`
`204`	`204`
`205`	`205`	`if (request.predicate) {`
`206`	`206`	`[result appendFormat:@" WHERE %@",`
`207`		`- [predicateDescriptor predicateDescription:request.predicate]];`
	`207`	`+ [predicateDescriptor`
	`208`	`+ predicateDescription:SENTRY_UNWRAP_NULLABLE(NSPredicate, request.predicate)]];`
`208`	`209`	`}`
`209`	`210`
`210`	`211`	`if (request.sortDescriptors.count > 0) {`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,8 @@ - (void)endCurrentSessionIfRequired`
`81`	`81`	`return;`
`82`	`82`	`}`
`83`	`83`
`84`		`- [session endSessionAbnormalWithTimestamp:appHangEvent.timestamp];`
	`84`	`+ [session`
	`85`	`+ endSessionAbnormalWithTimestamp:SENTRY_UNWRAP_NULLABLE(NSDate, appHangEvent).timestamp];`
`85`	`86`	`[fileManager storeAbnormalSession:session];`
`86`	`87`	`[fileManager deleteCurrentSession];`
`87`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ - (void)extractDebugImageAddressFromFrames:(NSArray<SentryFrame > )frames`
`67`	`67`	`{`
`68`	`68`	`for (SentryFrame *frame in frames) {`
`69`	`69`	`if (frame.imageAddress) {`
`70`		`- [set addObject:frame.imageAddress];`
	`70`	`+ [set addObject:SENTRY_UNWRAP_NULLABLE(NSString, frame.imageAddress)];`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`}`
`@@ -85,7 +85,8 @@ - (void)extractDebugImageAddressFromFrames:(NSArray<SentryFrame > )frames`
`85`	`85`	`# pragma clang diagnostic pop`
`86`	`86`
`87`	`87`	`for (SentryDebugMeta *sourceImage in binaryImages) {`
`88`		`- if ([addresses containsObject:sourceImage.imageAddress]) {`
	`88`	`+ if (sourceImage.imageAddress &&`
	`89`	`+ [addresses containsObject:SENTRY_UNWRAP_NULLABLE(NSString, sourceImage.imageAddress)]) {`
`89`	`90`	`[result addObject:sourceImage];`
`90`	`91`	`}`
`91`	`92`	`}`