ref: Delete dead code in SentryCrashMach (#3827)

Author: philipphofmann

Sources/SentryCrash/Recording/Tools/SentryCrashMach.c

@@ -128,63 +128,3 @@ sentrycrashmach_kernelReturnCodeName(const int64_t returnCode)
 #define EXC_UNIX_BAD_SYSCALL 0x10000 /* SIGSYS */
 #define EXC_UNIX_BAD_PIPE 0x10001 /* SIGPIPE */
 #define EXC_UNIX_ABORT 0x10002 /* SIGABRT */
-
-int
-sentrycrashmach_machExceptionForSignal(const int sigNum)
-{
-    switch (sigNum) {
-    case SIGFPE:
-        return EXC_ARITHMETIC;
-    case SIGSEGV:
-        return EXC_BAD_ACCESS;
-    case SIGBUS:
-        return EXC_BAD_ACCESS;
-    case SIGILL:
-        return EXC_BAD_INSTRUCTION;
-    case SIGTRAP:
-        return EXC_BREAKPOINT;
-    case SIGEMT:
-        return EXC_EMULATION;
-    case SIGSYS:
-        return EXC_UNIX_BAD_SYSCALL;
-    case SIGPIPE:
-        return EXC_UNIX_BAD_PIPE;
-    case SIGABRT:
-        // The Apple reporter uses EXC_CRASH instead of EXC_UNIX_ABORT
-        return EXC_CRASH;
-    case SIGKILL:
-        return EXC_SOFT_SIGNAL;
-    }
-    return 0;
-}
-
-int
-sentrycrashmach_signalForMachException(const int exception, const mach_exception_code_t code)
-{
-    switch (exception) {
-    case EXC_ARITHMETIC:
-        return SIGFPE;
-    case EXC_BAD_ACCESS:
-        return code == KERN_INVALID_ADDRESS ? SIGSEGV : SIGBUS;
-    case EXC_BAD_INSTRUCTION:
-        return SIGILL;
-    case EXC_BREAKPOINT:
-        return SIGTRAP;
-    case EXC_EMULATION:
-        return SIGEMT;
-    case EXC_SOFTWARE: {
-        switch (code) {
-        case EXC_UNIX_BAD_SYSCALL:
-            return SIGSYS;
-        case EXC_UNIX_BAD_PIPE:
-            return SIGPIPE;
-        case EXC_UNIX_ABORT:
-            return SIGABRT;
-        case EXC_SOFT_SIGNAL:
-            return SIGKILL;
-        }
-        break;
-    }
-    }
-    return 0;
-}

Sources/SentryCrash/Recording/Tools/SentryCrashMach.h

@@ -47,24 +47,6 @@ const char *sentrycrashmach_exceptionName(int64_t exceptionType);
  */
 const char *sentrycrashmach_kernelReturnCodeName(int64_t returnCode);
 
-/** Get the signal equivalent of a mach exception.
- *
- * @param exception The mach exception.
- *
- * @param code The mach exception code.
- *
- * @return The matching signal, or 0 if not found.
- */
-int sentrycrashmach_signalForMachException(int exception, int64_t code);
-
-/** Get the mach exception equivalent of a signal.
- *
- * @param signal The signal.
- *
- * @return The matching mach exception, or 0 if not found.
- */
-int sentrycrashmach_machExceptionForSignal(int signal);
-
 #ifdef __cplusplus
 }
 #endif

Tests/SentryTests/SentryCrash/SentryCrashMach_Tests.m

@@ -65,51 +65,4 @@ - (void)testVeryHighKernReturnCodeName
     XCTAssertTrue(result == NULL, @"");
 }
 
-#define EXC_UNIX_BAD_SYSCALL 0x10000 /* SIGSYS */
-#define EXC_UNIX_BAD_PIPE 0x10001 /* SIGPIPE */
-#define EXC_UNIX_ABORT 0x10002 /* SIGABRT */
-
-- (void)testMachExeptionsForSignals
-{
-    [self assertMachException:EXC_ARITHMETIC code:0 matchesSignal:SIGFPE];
-    [self assertMachException:EXC_BAD_ACCESS code:0 matchesSignal:SIGBUS];
-    [self assertMachException:EXC_BAD_ACCESS code:KERN_INVALID_ADDRESS matchesSignal:SIGSEGV];
-    [self assertMachException:EXC_BAD_INSTRUCTION code:0 matchesSignal:SIGILL];
-    [self assertMachException:EXC_BREAKPOINT code:0 matchesSignal:SIGTRAP];
-    [self assertMachException:EXC_EMULATION code:0 matchesSignal:SIGEMT];
-    [self assertMachException:EXC_SOFTWARE code:EXC_UNIX_BAD_SYSCALL matchesSignal:SIGSYS];
-    [self assertMachException:EXC_SOFTWARE code:EXC_UNIX_BAD_PIPE matchesSignal:SIGPIPE];
-    [self assertMachException:EXC_SOFTWARE code:EXC_UNIX_ABORT matchesSignal:SIGABRT];
-    [self assertMachException:EXC_SOFTWARE code:EXC_SOFT_SIGNAL matchesSignal:SIGKILL];
-    [self assertMachException:EXC_SOFTWARE code:100000000 matchesSignal:0];
-    [self assertMachException:1000000000 code:0 matchesSignal:0];
-}
-
-- (void)testSignalsForMachExeptions
-{
-    [self assertSignal:SIGFPE matchesMachException:EXC_ARITHMETIC];
-    [self assertSignal:SIGSEGV matchesMachException:EXC_BAD_ACCESS];
-    [self assertSignal:SIGBUS matchesMachException:EXC_BAD_ACCESS];
-    [self assertSignal:SIGILL matchesMachException:EXC_BAD_INSTRUCTION];
-    [self assertSignal:SIGTRAP matchesMachException:EXC_BREAKPOINT];
-    [self assertSignal:SIGEMT matchesMachException:EXC_EMULATION];
-    [self assertSignal:SIGSYS matchesMachException:EXC_UNIX_BAD_SYSCALL];
-    [self assertSignal:SIGPIPE matchesMachException:EXC_UNIX_BAD_PIPE];
-    [self assertSignal:SIGABRT matchesMachException:EXC_CRASH];
-    [self assertSignal:SIGKILL matchesMachException:EXC_SOFT_SIGNAL];
-    [self assertSignal:1000000000 matchesMachException:0];
-}
-
-- (void)assertMachException:(int)exception code:(int)code matchesSignal:(int)signal
-{
-    int result = sentrycrashmach_signalForMachException(exception, code);
-    XCTAssertEqual(result, signal, @"");
-}
-
-- (void)assertSignal:(int)signal matchesMachException:(int)exception
-{
-    int result = sentrycrashmach_machExceptionForSignal(signal);
-    XCTAssertEqual(result, exception, @"");
-}
-
 @end