diff --git a/Classes/BITCrashReportTextFormatter.m b/Classes/BITCrashReportTextFormatter.m index 4e40b50da1..895f1c012c 100644 --- a/Classes/BITCrashReportTextFormatter.m +++ b/Classes/BITCrashReportTextFormatter.m @@ -277,46 +277,32 @@ static const char *findSEL (const char *imageName, NSString *imageUUID, uint64_t break; } - /* If we were unable to determine the code type, fall back on the processor info's value. */ - if (codeType == nil && report.systemInfo.processorInfo.typeEncoding == PLCrashReportProcessorTypeEncodingMach) { - switch (report.systemInfo.processorInfo.type) { - case CPU_TYPE_ARM: + /* If we were unable to determine the code type, fall back on the legacy architecture value. */ + if (codeType == nil) { + switch (report.systemInfo.architecture) { + case PLCrashReportArchitectureARMv6: + case PLCrashReportArchitectureARMv7: codeType = @"ARM"; lp64 = false; break; - - case CPU_TYPE_ARM64: - codeType = @"ARM-64"; - lp64 = true; - break; - - case CPU_TYPE_X86: + case PLCrashReportArchitectureX86_32: codeType = @"X86"; lp64 = false; break; - - case CPU_TYPE_X86_64: + case PLCrashReportArchitectureX86_64: codeType = @"X86-64"; lp64 = true; break; - - case CPU_TYPE_POWERPC: + case PLCrashReportArchitecturePPC: codeType = @"PPC"; lp64 = false; break; - default: - codeType = [NSString stringWithFormat: @"Unknown (%llu)", report.systemInfo.processorInfo.type]; + codeType = [NSString stringWithFormat: @"Unknown (%d)", report.systemInfo.architecture]; lp64 = true; break; } - } - - /* If we still haven't determined the code type, we're totally clueless. */ - if (codeType == nil) { - codeType = @"Unknown"; - lp64 = true; - } + } } { diff --git a/Vendor/CrashReporter.framework/Versions/A/CrashReporter b/Vendor/CrashReporter.framework/Versions/A/CrashReporter index 797396d2e5..fa2fe5a9cc 100644 Binary files a/Vendor/CrashReporter.framework/Versions/A/CrashReporter and b/Vendor/CrashReporter.framework/Versions/A/CrashReporter differ diff --git a/Vendor/CrashReporter.framework/Versions/A/Headers/CrashReporter.h b/Vendor/CrashReporter.framework/Versions/A/Headers/CrashReporter.h index 26caf3dd62..c654319112 100644 --- a/Vendor/CrashReporter.framework/Versions/A/Headers/CrashReporter.h +++ b/Vendor/CrashReporter.framework/Versions/A/Headers/CrashReporter.h @@ -95,13 +95,7 @@ typedef enum { PLCrashReporterErrorCrashReportInvalid = 2, /** An attempt to use a resource which was in use at the time in a manner which would have conflicted with the request. */ - PLCrashReporterErrorResourceBusy = 3, - - /** The requested resource could not be found. */ - PLCRashReporterErrorNotFound = 4, - - /** Allocation failed. */ - PLCRashReporterErrorInsufficientMemory = 4 + PLCrashReporterErrorResourceBusy = 3 } PLCrashReporterError; diff --git a/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashMacros.h b/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashMacros.h index a933f3a8bd..6629bc4683 100644 --- a/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashMacros.h +++ b/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashMacros.h @@ -52,12 +52,6 @@ # define PLCR_CPP_BEGIN_NS namespace plcrash { # define PLCR_CPP_END_NS } # endif -# - /** @internal Define the plcrash::async namespace, automatically inserting an inline namespace containing the configured PLCRASHREPORTER_PREFIX, if any. */ -# define PLCR_CPP_BEGIN_ASYNC_NS PLCR_CPP_BEGIN_NS namespace async { - - /** @internal Close the definition of the `plcrash::async` namespace (and the PLCRASHREPORTER_PREFIX inline namespace, if any). */ -# define PLCR_CPP_END_ASYNC_NS PLCR_CPP_END_NS } #endif #ifdef __clang__ @@ -66,56 +60,12 @@ # define PLCR_PRAGMA_CLANG(_p) #endif -#ifdef __clang__ -# define PLCR_DEPRECATED __attribute__((deprecated)) -#else -# define PLCR_DEPRECATED -#endif - #if defined(__clang__) || defined(__GNUC__) # define PLCR_UNUSED __attribute__((unused)) #else # define PLCR_UNUSED #endif -#ifdef PLCR_PRIVATE -/** - * Marks a definition as deprecated only for for external clients, allowing - * uses of it internal fo the framework. - */ -#define PLCR_EXTERNAL_DEPRECATED - -/** - * @internal - * A macro to put above a definition marked PLCR_EXTERNAL_DEPRECATED that will - * silence warnings about there being a deprecation documentation marker but the - * definition not being marked deprecated. - */ -# define PLCR_EXTERNAL_DEPRECATED_NOWARN_PUSH() \ - PLCR_PRAGMA_CLANG("clang diagnostic push"); \ - PLCR_PRAGMA_CLANG("clang diagnostic ignored \"-Wdocumentation-deprecated-sync\"") - -/** - * @internal - * A macro to put below a definition marked PLCR_EXTERNAL_DEPRECATED that will - * silence warnings about there being a deprecation documentation marker but the - * definition not being marked deprecated. - */ -# define PLCR_EXTERNAL_DEPRECATED_NOWARN_POP() PLCR_PRAGMA_CLANG("clang diagnostic pop") -#else -# define PLCR_EXTERNAL_DEPRECATED PLCR_DEPRECATED -# define PLCR_EXTERNAL_DEPRECATED_NOWARN_PUSH() -# define PLCR_EXTERNAL_DEPRECATED_NOWARN_PUSH() -#endif /* PLCR_PRIVATE */ - -#ifdef PLCR_PRIVATE -# if defined(__clang__) && __has_feature(cxx_attributes) && __has_warning("-Wimplicit-fallthrough") -# define PLCR_FALLTHROUGH [[clang::fallthrough]] -# else -# define PLCR_FALLTHROUGH do {} while (0) -# endif -#endif - #ifdef PLCR_PRIVATE /** * @internal diff --git a/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashNamespace.h b/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashNamespace.h index b352ca197a..dba0200e5c 100644 --- a/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashNamespace.h +++ b/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashNamespace.h @@ -247,8 +247,8 @@ #define plcrash_nasync_image_list_free PLNS(plcrash_nasync_image_list_free) #define plcrash_nasync_image_list_init PLNS(plcrash_nasync_image_list_init) #define plcrash_nasync_image_list_remove PLNS(plcrash_nasync_image_list_remove) -#define plcrash_async_macho_free PLNS(plcrash_async_macho_free) -#define plcrash_async_macho_init PLNS(plcrash_async_macho_init) +#define plcrash_nasync_macho_free PLNS(plcrash_nasync_macho_free) +#define plcrash_nasync_macho_init PLNS(plcrash_nasync_macho_init) #define plcrash_populate_error PLNS(plcrash_populate_error) #define plcrash_populate_mach_error PLNS(plcrash_populate_mach_error) #define plcrash_populate_posix_error PLNS(plcrash_populate_posix_error) diff --git a/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportSystemInfo.h b/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportSystemInfo.h index 1bc59a81b0..e98c969c81 100644 --- a/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportSystemInfo.h +++ b/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportSystemInfo.h @@ -27,8 +27,6 @@ */ #import -#include "PLCrashMacros.h" -@class PLCrashReportProcessorInfo; /** * @ingroup constants @@ -57,7 +55,7 @@ typedef enum { * * Indicates the architecture under which a Crash Log was generated. * - * @note The architecture value has been deprecated in v1.1 and later crash reports. All new reports + * @deprecated The architecture value has been deprecated in v1.1 and later crash reports. All new reports * will make use of the new PLCrashReportProcessorInfo CPU type encodings. * * @internal @@ -79,7 +77,7 @@ typedef enum { * values. * @sa PLCrashReportArchitectureARMv6 */ - PLCrashReportArchitectureARM PLCR_DEPRECATED = PLCrashReportArchitectureARMv6, + PLCrashReportArchitectureARM = PLCrashReportArchitectureARMv6, /** PPC */ PLCrashReportArchitecturePPC = 3, @@ -96,9 +94,7 @@ typedef enum { extern PLCrashReportOperatingSystem PLCrashReportHostOperatingSystem; -PLCR_EXTERNAL_DEPRECATED_NOWARN_PUSH(); -extern PLCrashReportArchitecture PLCrashReportHostArchitecture PLCR_EXTERNAL_DEPRECATED; -PLCR_EXTERNAL_DEPRECATED_NOWARN_PUSH(); +extern PLCrashReportArchitecture PLCrashReportHostArchitecture; @interface PLCrashReportSystemInfo : NSObject { @private @@ -116,27 +112,17 @@ PLCR_EXTERNAL_DEPRECATED_NOWARN_PUSH(); /** Date crash report was generated. May be nil if the date is unknown. */ NSDate *_timestamp; - - /** Processor information. */ - PLCrashReportProcessorInfo *_processorInfo; } - (id) initWithOperatingSystem: (PLCrashReportOperatingSystem) operatingSystem operatingSystemVersion: (NSString *) operatingSystemVersion architecture: (PLCrashReportArchitecture) architecture - timestamp: (NSDate *) timestamp PLCR_DEPRECATED; + timestamp: (NSDate *) timestamp; - (id) initWithOperatingSystem: (PLCrashReportOperatingSystem) operatingSystem operatingSystemVersion: (NSString *) operatingSystemVersion operatingSystemBuild: (NSString *) operatingSystemBuild architecture: (PLCrashReportArchitecture) architecture - timestamp: (NSDate *) timestamp PLCR_DEPRECATED; - -- (id) initWithOperatingSystem: (PLCrashReportOperatingSystem) operatingSystem - operatingSystemVersion: (NSString *) operatingSystemVersion - operatingSystemBuild: (NSString *) operatingSystemBuild - architecture: (PLCrashReportArchitecture) architecture - processorInfo: (PLCrashReportProcessorInfo *) processorInfo timestamp: (NSDate *) timestamp; /** The operating system. */ @@ -151,13 +137,9 @@ PLCR_EXTERNAL_DEPRECATED_NOWARN_PUSH(); /** Architecture. @deprecated The architecture value has been deprecated in v1.1 and later crash reports. All new reports * include the CPU type as part of the crash report's machine info structure, using the PLCrashReportProcessorInfo * extensible encoding. */ -@property(nonatomic, readonly) PLCrashReportArchitecture architecture PLCR_DEPRECATED; +@property(nonatomic, readonly) PLCrashReportArchitecture architecture; /** Date and time that the crash report was generated. This may be unavailable, and this property will be nil. */ @property(nonatomic, readonly) NSDate *timestamp; -/** The processor type. For v1.2 reports and later, this is an alias to the machine info's processorInfo. - * For earlier reports, this will be synthesized from the deprecated architecture property. */ -@property(nonatomic, readonly) PLCrashReportProcessorInfo *processorInfo; - @end diff --git a/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReporter.h b/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReporter.h index 5c9b0f3ff1..455c417ac7 100644 --- a/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReporter.h +++ b/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReporter.h @@ -30,7 +30,6 @@ #import #import "PLCrashReporterConfig.h" -#import "PLCrashMacros.h" @class PLCrashMachExceptionServer; @class PLCrashMachExceptionPortSet; @@ -45,7 +44,7 @@ * @param uap The crash's threads context. * @param context The API client's supplied context value. * - * @sa The @ref async_safety documentation. + * @sa @ref async_safety * @sa PLCrashReporter::setPostCrashCallbacks: */ typedef void (*PLCrashReporterPostCrashSignalCallback)(siginfo_t *info, ucontext_t *uap, void *context); @@ -56,7 +55,7 @@ typedef void (*PLCrashReporterPostCrashSignalCallback)(siginfo_t *info, ucontext * This structure contains callbacks supported by PLCrashReporter to allow the host application to perform * additional tasks prior to program termination after a crash has occured. * - * @sa The @ref async_safety documentation. + * @sa @ref async_safety */ typedef struct PLCrashReporterCallbacks { /** The version number of this structure. If not one of the defined version numbers for this type, the behavior @@ -88,7 +87,7 @@ typedef struct PLCrashReporterCallbacks { /** YES if the crash reporter has been enabled */ BOOL _enabled; - + #if PLCRASH_FEATURE_MACH_EXCEPTIONS /** The backing Mach exception server, if any. Nil if the reporter has not been enabled, or if * the configured signal handler type is not PLCrashReporterSignalHandlerTypeMach. */ @@ -111,7 +110,7 @@ typedef struct PLCrashReporterCallbacks { NSString *_crashReportDirectory; } -+ (PLCrashReporter *) sharedReporter PLCR_DEPRECATED; ++ (PLCrashReporter *) sharedReporter; - (instancetype) initWithConfiguration: (PLCrashReporterConfig *) config; diff --git a/Vendor/CrashReporter.framework/Versions/A/Resources/Info.plist b/Vendor/CrashReporter.framework/Versions/A/Resources/Info.plist index 7ffcde093d..7623277712 100644 --- a/Vendor/CrashReporter.framework/Versions/A/Resources/Info.plist +++ b/Vendor/CrashReporter.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 14E46 + 14F27 CFBundleDevelopmentRegion English CFBundleExecutable @@ -18,21 +18,25 @@ FMWK CFBundleSignature ???? + CFBundleSupportedPlatforms + + MacOSX + CFBundleVersion 1.0 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 6E35b + 7A176x DTPlatformVersion GM DTSDKBuild - 14D125 + 15A244e DTSDKName - macosx10.10 + macosx10.11 DTXcode - 0640 + 0700 DTXcodeBuild - 6E35b + 7A176x