Code clean-up (#9166)

Removes unused code surrounding mach exception mask and delegate.

Author: elenadoty

Crashlytics/Crashlytics/Components/FIRCLSContext.h

@@ -51,8 +51,6 @@ typedef struct {
 #if CLS_MACH_EXCEPTION_SUPPORTED
   void* machStack;
 #endif
-  void* delegate;
-  void* callbackDelegate;
 
   FIRCLSBinaryImageReadOnlyContext binaryimage;
   FIRCLSExceptionReadOnlyContext exception;
@@ -81,15 +79,11 @@ typedef struct {
 } FIRCLSContext;
 
 typedef struct {
-  void* delegate;
   const char* customBundleId;
   const char* rootPath;
   const char* previouslyCrashedFileRootPath;
   const char* sessionId;
   const char* betaToken;
-#if CLS_MACH_EXCEPTION_SUPPORTED
-  exception_mask_t machExceptionMask;
-#endif
   bool errorsEnabled;
   bool customExceptionsEnabled;
   uint32_t maxCustomExceptions;

Crashlytics/Crashlytics/Components/FIRCLSContext.m

@@ -74,26 +74,6 @@ FIRCLSContextInitData FIRCLSContextBuildInitData(FIRCLSInternalReport* report,
   initData.maxKeyValues = [settings maxCustomKeys];
   initData.betaToken = "";
 
-  // If this is set, then we could attempt to do a synchronous submission for certain kinds of
-  // events (exceptions). This is a very cool feature, but adds complexity to the backend. For now,
-  // we're going to leave this disabled. It does work in the exception case, but will ultimtely
-  // result in the following crash to be discared. Usually that crash isn't interesting. But, if it
-  // was, we'd never have a chance to see it.
-  initData.delegate = nil;
-
-#if CLS_MACH_EXCEPTION_SUPPORTED
-  __block exception_mask_t mask = 0;
-
-  // TODO(b/141241224) This if statement was hardcoded to no, so this block was never run
-  //  FIRCLSSignalEnumerateHandledSignals(^(int idx, int signal) {
-  //    if ([self.delegate ensureDeliveryOfUnixSignal:signal]) {
-  //      mask |= FIRCLSMachExceptionMaskForSignal(signal);
-  //    }
-  //  });
-
-  initData.machExceptionMask = mask;
-#endif
-
   return initData;
 }
 
@@ -126,7 +106,6 @@ bool FIRCLSContextInitialize(FIRCLSInternalReport* report,
 
   // some values that aren't tied to particular subsystem
   _firclsContext.readonly->debuggerAttached = FIRCLSProcessDebuggerAttached();
-  _firclsContext.readonly->delegate = initData->delegate;
 
   dispatch_group_async(group, queue, ^{
     FIRCLSHostInitialize(&_firclsContext.readonly->host);
@@ -211,7 +190,7 @@ bool FIRCLSContextInitialize(FIRCLSInternalReport* report,
       _firclsContext.readonly->machException.path =
           FIRCLSContextAppendToRoot(rootPath, FIRCLSReportMachExceptionFile);
 
-      FIRCLSMachExceptionInit(&_firclsContext.readonly->machException, initData->machExceptionMask);
+      FIRCLSMachExceptionInit(&_firclsContext.readonly->machException);
     });
 #endif
 
@@ -222,7 +201,7 @@ bool FIRCLSContextInitialize(FIRCLSInternalReport* report,
           initData->customExceptionsEnabled ? initData->maxCustomExceptions : 0;
 
       FIRCLSExceptionInitialize(&_firclsContext.readonly->exception,
-                                &_firclsContext.writable->exception, initData->delegate);
+                                &_firclsContext.writable->exception);
     });
   } else {
     FIRCLSSDKLog("Debugger present - not installing handlers\n");

Crashlytics/Crashlytics/Controllers/FIRCLSReportManager_Private.h

@@ -29,6 +29,4 @@
 
 @property(nonatomic, strong) FIRCLSLaunchMarkerModel *launchMarker;
 
-- (BOOL)potentiallySubmittableCrashOccurred;
-
 @end

Crashlytics/Crashlytics/Handlers/FIRCLSException.h

@@ -53,8 +53,7 @@ typedef struct {
 __BEGIN_DECLS
 
 void FIRCLSExceptionInitialize(FIRCLSExceptionReadOnlyContext* roContext,
-                               FIRCLSExceptionWritableContext* rwContext,
-                               void* delegate);
+                               FIRCLSExceptionWritableContext* rwContext);
 void FIRCLSExceptionCheckHandlers(void* delegate);
 
 void FIRCLSExceptionRaiseTestObjCException(void) __attribute((noreturn));
@@ -66,8 +65,7 @@ void FIRCLSExceptionRecordNSException(NSException* exception);
 void FIRCLSExceptionRecord(FIRCLSExceptionType type,
                            const char* name,
                            const char* reason,
-                           NSArray<FIRStackFrame*>* frames,
-                           BOOL attemptDelivery);
+                           NSArray<FIRStackFrame*>* frames);
 #endif
 
 __END_DECLS

Crashlytics/Crashlytics/Handlers/FIRCLSException.mm

@@ -57,8 +57,7 @@
 
 #pragma mark - API
 void FIRCLSExceptionInitialize(FIRCLSExceptionReadOnlyContext *roContext,
-                               FIRCLSExceptionWritableContext *rwContext,
-                               void *delegate) {
+                               FIRCLSExceptionWritableContext *rwContext) {
   if (!FIRCLSUnlinkIfExists(roContext->path)) {
     FIRCLSSDKLog("Unable to reset the exception file %s\n", strerror(errno));
   }
@@ -82,8 +81,7 @@ void FIRCLSExceptionRecordModel(FIRExceptionModel *exceptionModel) {
   const char *name = [[exceptionModel.name copy] UTF8String];
   const char *reason = [[exceptionModel.reason copy] UTF8String] ?: "";
 
-  FIRCLSExceptionRecord(FIRCLSExceptionTypeCustom, name, reason, [exceptionModel.stackTrace copy],
-                        NO);
+  FIRCLSExceptionRecord(FIRCLSExceptionTypeCustom, name, reason, [exceptionModel.stackTrace copy]);
 }
 
 void FIRCLSExceptionRecordNSException(NSException *exception) {
@@ -107,7 +105,7 @@ void FIRCLSExceptionRecordNSException(NSException *exception) {
   }
 
   FIRCLSExceptionRecord(FIRCLSExceptionTypeObjectiveC, [name UTF8String], [reason UTF8String],
-                        frames, YES);
+                        frames);
 }
 
 static void FIRCLSExceptionRecordFrame(FIRCLSFile *file, FIRStackFrame *frame) {
@@ -189,15 +187,14 @@ void FIRCLSExceptionWrite(FIRCLSFile *file,
 void FIRCLSExceptionRecord(FIRCLSExceptionType type,
                            const char *name,
                            const char *reason,
-                           NSArray<FIRStackFrame *> *frames,
-                           BOOL attemptDelivery) {
+                           NSArray<FIRStackFrame *> *frames) {
   if (!FIRCLSContextIsInitialized()) {
     return;
   }
 
   bool native = FIRCLSExceptionIsNative(type);
 
-  FIRCLSSDKLog("Recording an exception structure (%d, %d)\n", attemptDelivery, native);
+  FIRCLSSDKLog("Recording an exception structure (%d)\n", native);
 
   // exceptions can happen on multiple threads at the same time
   if (native) {
@@ -218,9 +215,6 @@ void FIRCLSExceptionRecord(FIRCLSExceptionType type,
       FIRCLSFileClose(&file);
 
       // disallow immediate delivery for non-native exceptions
-      if (attemptDelivery) {
-        FIRCLSHandlerAttemptImmediateDelivery();
-      }
     });
   } else {
     FIRCLSUserLoggingWriteAndCheckABFiles(
@@ -278,21 +272,19 @@ static void FIRCLSCatchAndRecordActiveException(std::type_info *typeInfo) {
 #endif
     }
   } catch (const char *exc) {
-    FIRCLSExceptionRecord(FIRCLSExceptionTypeCpp, "const char *", exc, nil, YES);
+    FIRCLSExceptionRecord(FIRCLSExceptionTypeCpp, "const char *", exc, nil);
   } catch (const std::string &exc) {
-    FIRCLSExceptionRecord(FIRCLSExceptionTypeCpp, "std::string", exc.c_str(), nil, YES);
+    FIRCLSExceptionRecord(FIRCLSExceptionTypeCpp, "std::string", exc.c_str(), nil);
   } catch (const std::exception &exc) {
-    FIRCLSExceptionRecord(FIRCLSExceptionTypeCpp, FIRCLSExceptionDemangle(name), exc.what(), nil,
-                          YES);
+    FIRCLSExceptionRecord(FIRCLSExceptionTypeCpp, FIRCLSExceptionDemangle(name), exc.what(), nil);
   } catch (const std::exception *exc) {
-    FIRCLSExceptionRecord(FIRCLSExceptionTypeCpp, FIRCLSExceptionDemangle(name), exc->what(), nil,
-                          YES);
+    FIRCLSExceptionRecord(FIRCLSExceptionTypeCpp, FIRCLSExceptionDemangle(name), exc->what(), nil);
   } catch (const std::bad_alloc &exc) {
     // it is especially important to avoid demangling in this case, because the expetation at this
     // point is that all allocations could fail
-    FIRCLSExceptionRecord(FIRCLSExceptionTypeCpp, "std::bad_alloc", exc.what(), nil, YES);
+    FIRCLSExceptionRecord(FIRCLSExceptionTypeCpp, "std::bad_alloc", exc.what(), nil);
   } catch (...) {
-    FIRCLSExceptionRecord(FIRCLSExceptionTypeCpp, FIRCLSExceptionDemangle(name), "", nil, YES);
+    FIRCLSExceptionRecord(FIRCLSExceptionTypeCpp, FIRCLSExceptionDemangle(name), "", nil);
   }
 }
 

Crashlytics/Crashlytics/Handlers/FIRCLSHandler.h

@@ -21,6 +21,5 @@
 __BEGIN_DECLS
 
 void FIRCLSHandler(FIRCLSFile* file, thread_t crashedThread, void* uapVoid);
-void FIRCLSHandlerAttemptImmediateDelivery(void);
 
 __END_DECLS

Crashlytics/Crashlytics/Handlers/FIRCLSHandler.m

@@ -47,12 +47,3 @@ void FIRCLSHandler(FIRCLSFile* file, thread_t crashedThread, void* uapVoid) {
 
   FIRCLSProcessResumeAllOtherThreads(&process);
 }
-
-void FIRCLSHandlerAttemptImmediateDelivery(void) {
-  // now, attempt to relay the event to the delegate
-  FIRCLSReportManager* manager = (__bridge id)_firclsContext.readonly->delegate;
-
-  if ([manager respondsToSelector:@selector(potentiallySubmittableCrashOccurred)]) {
-    [manager potentiallySubmittableCrashOccurred];
-  }
-}

Crashlytics/Crashlytics/Handlers/FIRCLSMachException.c

@@ -30,7 +30,6 @@
 #include <unistd.h>
 
 #pragma mark Prototypes
-static exception_mask_t FIRCLSMachExceptionMask(void);
 static void* FIRCLSMachExceptionServer(void* argument);
 static bool FIRCLSMachExceptionThreadStart(FIRCLSMachExceptionReadContext* context);
 static bool FIRCLSMachExceptionReadMessage(FIRCLSMachExceptionReadContext* context,
@@ -40,20 +39,19 @@ static kern_return_t FIRCLSMachExceptionDispatchMessage(FIRCLSMachExceptionReadC
 static bool FIRCLSMachExceptionReply(FIRCLSMachExceptionReadContext* context,
                                      MachExceptionMessage* message,
                                      kern_return_t result);
-static bool FIRCLSMachExceptionRegister(FIRCLSMachExceptionReadContext* context,
-                                        exception_mask_t ignoreMask);
+static bool FIRCLSMachExceptionRegister(FIRCLSMachExceptionReadContext* context);
 static bool FIRCLSMachExceptionUnregister(FIRCLSMachExceptionOriginalPorts* originalPorts,
                                           exception_mask_t mask);
 static bool FIRCLSMachExceptionRecord(FIRCLSMachExceptionReadContext* context,
                                       MachExceptionMessage* message);
 
 #pragma mark - Initialization
-void FIRCLSMachExceptionInit(FIRCLSMachExceptionReadContext* context, exception_mask_t ignoreMask) {
+void FIRCLSMachExceptionInit(FIRCLSMachExceptionReadContext* context) {
   if (!FIRCLSUnlinkIfExists(context->path)) {
     FIRCLSSDKLog("Unable to reset the mach exception file %s\n", strerror(errno));
   }
 
-  if (!FIRCLSMachExceptionRegister(context, ignoreMask)) {
+  if (!FIRCLSMachExceptionRegister(context)) {
     FIRCLSSDKLog("Unable to register mach exception handler\n");
     return;
   }
@@ -270,8 +268,7 @@ static bool FIRCLSMachExceptionReply(FIRCLSMachExceptionReadContext* context,
 }
 
 #pragma mark - Registration
-static bool FIRCLSMachExceptionRegister(FIRCLSMachExceptionReadContext* context,
-                                        exception_mask_t ignoreMask) {
+static bool FIRCLSMachExceptionRegister(FIRCLSMachExceptionReadContext* context) {
   mach_port_t task = mach_task_self();
 
   kern_return_t kr = mach_port_allocate(task, MACH_PORT_RIGHT_RECEIVE, &context->port);
@@ -291,7 +288,7 @@ static bool FIRCLSMachExceptionRegister(FIRCLSMachExceptionReadContext* context,
   // but clear out any that are in our ignore list.  We do this by ANDing with the bitwise
   // negation.  Because we are only clearing bits, there's no way to set an incorrect mask
   // using ignoreMask.
-  context->mask = FIRCLSMachExceptionMask() & ~ignoreMask;
+  context->mask = FIRCLSMachExceptionMask();
 
   // ORing with MACH_EXCEPTION_CODES will produce 64-bit exception data
   kr = task_swap_exception_ports(task, context->mask, context->port,

Crashlytics/Crashlytics/Handlers/FIRCLSMachException.h

@@ -66,8 +66,7 @@ typedef struct {
 } FIRCLSMachExceptionReadContext;
 
 #pragma mark - API
-void FIRCLSMachExceptionInit(FIRCLSMachExceptionReadContext* context, exception_mask_t ignoreMask);
-exception_mask_t FIRCLSMachExceptionMaskForSignal(int signal);
+void FIRCLSMachExceptionInit(FIRCLSMachExceptionReadContext* context);
 
 void FIRCLSMachExceptionCheckHandlers(void);