Skip to content

Commit

Permalink
Merge branch 'release/plcrashreporter-1.2.1' into release/plcrashrepo…
Browse files Browse the repository at this point in the history 
…rter-1.2
  • Loading branch information
@landonf
landonf committed Jul 9, 2015
2 parents 51531ff + ee8e45b commit 6b0bb72
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 54 deletions.
38 changes: 0 additions & 38 deletions CrashReporter.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -463,18 +463,6 @@
05CD36D40EF25717000FDE88 /* PLCrashLogWriterEncoding.c in Sources */ = {isa = PBXBuildFile; fileRef = 05CD36CD0EF25717000FDE88 /* PLCrashLogWriterEncoding.c */; };
05CD36D50EF25717000FDE88 /* PLCrashLogWriterEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 05CD36CC0EF25717000FDE88 /* PLCrashLogWriterEncoding.h */; };
05CD36D60EF25717000FDE88 /* PLCrashLogWriterEncoding.c in Sources */ = {isa = PBXBuildFile; fileRef = 05CD36CD0EF25717000FDE88 /* PLCrashLogWriterEncoding.c */; };
05D8FE4C16ACAA6E000ED70C /* PLCrashAsyncAllocator.c in Sources */ = {isa = PBXBuildFile; fileRef = 05D8FE4B16ACAA6E000ED70C /* PLCrashAsyncAllocator.c */; };
05D8FE4D16ACAA6E000ED70C /* PLCrashAsyncAllocator.c in Sources */ = {isa = PBXBuildFile; fileRef = 05D8FE4B16ACAA6E000ED70C /* PLCrashAsyncAllocator.c */; };
05D8FE4E16ACAA6E000ED70C /* PLCrashAsyncAllocator.c in Sources */ = {isa = PBXBuildFile; fileRef = 05D8FE4B16ACAA6E000ED70C /* PLCrashAsyncAllocator.c */; };
05D8FE4F16ACAA6E000ED70C /* PLCrashAsyncAllocator.c in Sources */ = {isa = PBXBuildFile; fileRef = 05D8FE4B16ACAA6E000ED70C /* PLCrashAsyncAllocator.c */; };
05D8FE5016ACAA6E000ED70C /* PLCrashAsyncAllocator.c in Sources */ = {isa = PBXBuildFile; fileRef = 05D8FE4B16ACAA6E000ED70C /* PLCrashAsyncAllocator.c */; };
05D8FE5116ACAA6E000ED70C /* PLCrashAsyncAllocator.c in Sources */ = {isa = PBXBuildFile; fileRef = 05D8FE4B16ACAA6E000ED70C /* PLCrashAsyncAllocator.c */; };
05D8FE5216ACAA6E000ED70C /* PLCrashAsyncAllocator.c in Sources */ = {isa = PBXBuildFile; fileRef = 05D8FE4B16ACAA6E000ED70C /* PLCrashAsyncAllocator.c */; };
05D8FE5416ACAA81000ED70C /* PLCrashAsyncAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = 05D8FE5316ACAA81000ED70C /* PLCrashAsyncAllocator.h */; };
05D8FE5516ACAA81000ED70C /* PLCrashAsyncAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = 05D8FE5316ACAA81000ED70C /* PLCrashAsyncAllocator.h */; };
05D8FE5816ACC8CD000ED70C /* PLCrashAsyncAllocatorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 05D8FE5716ACC8CD000ED70C /* PLCrashAsyncAllocatorTests.m */; };
05D8FE5916ACC8CD000ED70C /* PLCrashAsyncAllocatorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 05D8FE5716ACC8CD000ED70C /* PLCrashAsyncAllocatorTests.m */; };
05D8FE5A16ACC8CD000ED70C /* PLCrashAsyncAllocatorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 05D8FE5716ACC8CD000ED70C /* PLCrashAsyncAllocatorTests.m */; };
05D9E5451676598200B39833 /* PLCrashReportStackFrameInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 05D9E5431676598200B39833 /* PLCrashReportStackFrameInfo.h */; };
05D9E5471676598200B39833 /* PLCrashReportStackFrameInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 05D9E5431676598200B39833 /* PLCrashReportStackFrameInfo.h */; };
05D9E5481676598200B39833 /* PLCrashReportStackFrameInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 05D9E5431676598200B39833 /* PLCrashReportStackFrameInfo.h */; };
Expand Down Expand Up @@ -1252,9 +1240,6 @@
05CD36480EF247A9000FDE88 /* PLCrashAsyncTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLCrashAsyncTests.m; sourceTree = "<group>"; };
05CD36CC0EF25717000FDE88 /* PLCrashLogWriterEncoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLCrashLogWriterEncoding.h; sourceTree = "<group>"; };
05CD36CD0EF25717000FDE88 /* PLCrashLogWriterEncoding.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = PLCrashLogWriterEncoding.c; sourceTree = "<group>"; };
05D8FE4B16ACAA6E000ED70C /* PLCrashAsyncAllocator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = PLCrashAsyncAllocator.c; sourceTree = "<group>"; };
05D8FE5316ACAA81000ED70C /* PLCrashAsyncAllocator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLCrashAsyncAllocator.h; sourceTree = "<group>"; };
05D8FE5716ACC8CD000ED70C /* PLCrashAsyncAllocatorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLCrashAsyncAllocatorTests.m; sourceTree = "<group>"; };
05D9E5431676598200B39833 /* PLCrashReportStackFrameInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLCrashReportStackFrameInfo.h; sourceTree = "<group>"; };
05D9E5441676598200B39833 /* PLCrashReportStackFrameInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLCrashReportStackFrameInfo.m; sourceTree = "<group>"; };
05D9E54E16765A0200B39833 /* PLCrashReportRegisterInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLCrashReportRegisterInfo.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1865,7 +1850,6 @@
052A46BD1363650100987004 /* PLCrashAsyncImageList.cpp */,
052A46F713637DE000987004 /* PLCrashAsyncImageListTests.m */,
05A17DC316D7F7FB00888448 /* Thread State */,
05D8FE4916ACAA44000ED70C /* Allocator */,
05A5E28517C0411F008A75E5 /* Linked List */,
05BB4CA0166D40B90075171B /* Memory Objects */,
05BB4C9F166D40AD0075171B /* Symbolication */,
Expand Down Expand Up @@ -1893,16 +1877,6 @@
name = "Host and Process Info";
sourceTree = "<group>";
};
05D8FE4916ACAA44000ED70C /* Allocator */ = {
isa = PBXGroup;
children = (
05D8FE5316ACAA81000ED70C /* PLCrashAsyncAllocator.h */,
05D8FE4B16ACAA6E000ED70C /* PLCrashAsyncAllocator.c */,
05D8FE5716ACC8CD000ED70C /* PLCrashAsyncAllocatorTests.m */,
);
name = Allocator;
sourceTree = "<group>";
};
05D9E5411676596200B39833 /* Stack Frame Info */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -2191,7 +2165,6 @@
05771CE313683EDD001DE4B1 /* PLCrashReportMachineInfo.h in Headers */,
05771CE213683ED4001DE4B1 /* PLCrashReportProcessorInfo.h in Headers */,
05DEE6491636E642007E99DC /* PLCrashAsyncMObject.h in Headers */,
05D8FE5516ACAA81000ED70C /* PLCrashAsyncAllocator.h in Headers */,
05A17DED16DBCDBF00888448 /* PLCrashAsyncThread_x86.h in Headers */,
05A17DEF16DBCDBF00888448 /* PLCrashAsyncThread_arm.h in Headers */,
05F3CD6616DD6A58007911FB /* PLCrashFrameCompactUnwind.h in Headers */,
Expand Down Expand Up @@ -2368,7 +2341,6 @@
05EB2B1015B6FDA80066EB4D /* PLCrashReporterNSError.h in Headers */,
05DEE6481636E642007E99DC /* PLCrashAsyncMObject.h in Headers */,
0573B42D1681098E00395F2A /* PLCrashMachExceptionServer.h in Headers */,
05D8FE5416ACAA81000ED70C /* PLCrashAsyncAllocator.h in Headers */,
FCE45A25B973D69EE5DDE269 /* PLCrashFrameStackUnwind.h in Headers */,
05A17DCE16D7F82700888448 /* PLCrashAsyncThread.h in Headers */,
05A17DEC16DBCDBF00888448 /* PLCrashAsyncThread_x86.h in Headers */,
Expand Down Expand Up @@ -2891,7 +2863,6 @@
05D9E55616765A0200B39833 /* PLCrashReportRegisterInfo.m in Sources */,
05D9E56116765D0200B39833 /* PLCrashReportSymbolInfo.m in Sources */,
0573B4321681098E00395F2A /* PLCrashMachExceptionServer.m in Sources */,
05D8FE4E16ACAA6E000ED70C /* PLCrashAsyncAllocator.c in Sources */,
FCE45962BDFEEEFAF00DA7E4 /* PLCrashFrameStackUnwind.c in Sources */,
05A17DC716D7F81600888448 /* PLCrashAsyncThread.c in Sources */,
05A17DF316DBD0AD00888448 /* PLCrashAsyncThread_x86.c in Sources */,
Expand Down Expand Up @@ -2958,7 +2929,6 @@
05D9E55716765A0200B39833 /* PLCrashReportRegisterInfo.m in Sources */,
05D9E56216765D0200B39833 /* PLCrashReportSymbolInfo.m in Sources */,
0573B4331681098E00395F2A /* PLCrashMachExceptionServer.m in Sources */,
05D8FE4F16ACAA6E000ED70C /* PLCrashAsyncAllocator.c in Sources */,
FCE45AC70B3E71216D5B18D2 /* PLCrashFrameStackUnwind.c in Sources */,
05A17DC816D7F81600888448 /* PLCrashAsyncThread.c in Sources */,
05A17DF416DBD0AD00888448 /* PLCrashAsyncThread_x86.c in Sources */,
Expand Down Expand Up @@ -3026,8 +2996,6 @@
05FDFC84168950F600463E43 /* PLCrashMachExceptionServerTests.m in Sources */,
052951EA1696965E006EDA8A /* PLCrashLogWriterEncodingTests.m in Sources */,
052951EF1696A461006EDA8A /* PLCrashLogWriterEncodingTests.proto in Sources */,
05D8FE5016ACAA6E000ED70C /* PLCrashAsyncAllocator.c in Sources */,
05D8FE5816ACC8CD000ED70C /* PLCrashAsyncAllocatorTests.m in Sources */,
05A533DE16D6ACBF00C5E2B3 /* PLCrashFrameStackUnwindTests.m in Sources */,
05A17DB816D7E36400888448 /* PLCrashFrameStackUnwind.c in Sources */,
05A17DC916D7F81600888448 /* PLCrashAsyncThread.c in Sources */,
Expand Down Expand Up @@ -3129,8 +3097,6 @@
05FDFC85168950F600463E43 /* PLCrashMachExceptionServerTests.m in Sources */,
052951EB1696965E006EDA8A /* PLCrashLogWriterEncodingTests.m in Sources */,
052951F01696A461006EDA8A /* PLCrashLogWriterEncodingTests.proto in Sources */,
05D8FE5116ACAA6E000ED70C /* PLCrashAsyncAllocator.c in Sources */,
05D8FE5916ACC8CD000ED70C /* PLCrashAsyncAllocatorTests.m in Sources */,
05A533DF16D6ACBF00C5E2B3 /* PLCrashFrameStackUnwindTests.m in Sources */,
05A17DB916D7E36A00888448 /* PLCrashFrameStackUnwind.c in Sources */,
05A7E7AF174284EE00ACA689 /* PLCrashFrameCompactUnwind.c in Sources */,
Expand Down Expand Up @@ -3232,8 +3198,6 @@
052951EC1696965E006EDA8A /* PLCrashLogWriterEncodingTests.m in Sources */,
052951F11696A461006EDA8A /* PLCrashLogWriterEncodingTests.proto in Sources */,
058484AE1804841100A56049 /* unwind_test_arm64_frameless.S in Sources */,
05D8FE5216ACAA6E000ED70C /* PLCrashAsyncAllocator.c in Sources */,
05D8FE5A16ACC8CD000ED70C /* PLCrashAsyncAllocatorTests.m in Sources */,
05A533E016D6ACBF00C5E2B3 /* PLCrashFrameStackUnwindTests.m in Sources */,
05A17DBA16D7E37100888448 /* PLCrashFrameStackUnwind.c in Sources */,
05A7E7AE174284E700ACA689 /* PLCrashFrameCompactUnwind.c in Sources */,
Expand Down Expand Up @@ -3343,7 +3307,6 @@
05D9E55F16765D0200B39833 /* PLCrashReportSymbolInfo.m in Sources */,
0573B4301681098E00395F2A /* PLCrashMachExceptionServer.m in Sources */,
0581B521168FDB280098C103 /* mach_exc.defs in Sources */,
05D8FE4C16ACAA6E000ED70C /* PLCrashAsyncAllocator.c in Sources */,
FCE4550BA74D9DF923CFCD5A /* PLCrashFrameStackUnwind.c in Sources */,
05A17DC516D7F81600888448 /* PLCrashAsyncThread.c in Sources */,
05A17DF116DBD0AD00888448 /* PLCrashAsyncThread_x86.c in Sources */,
Expand Down Expand Up @@ -3420,7 +3383,6 @@
05D9E56016765D0200B39833 /* PLCrashReportSymbolInfo.m in Sources */,
0573B4311681098E00395F2A /* PLCrashMachExceptionServer.m in Sources */,
0581B522168FDB280098C103 /* mach_exc.defs in Sources */,
05D8FE4D16ACAA6E000ED70C /* PLCrashAsyncAllocator.c in Sources */,
FCE4566DF9168DCC484928E1 /* PLCrashFrameStackUnwind.c in Sources */,
05A17DC616D7F81600888448 /* PLCrashAsyncThread.c in Sources */,
05A17DF216DBD0AD00888448 /* PLCrashAsyncThread_x86.c in Sources */,
Expand Down
17 changes: 1 addition & 16 deletions Source/PLCrashAsyncMachOImageTests.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,12 +348,7 @@ - (void) testReadSymbolName {
IMP localIMP = class_getMethodImplementation([self class], _cmd);
Dl_info dli;
STAssertTrue(dladdr((void *)localIMP, &dli) != 0, @"Failed to look up symbol");
// XXX-TODO-DLADDR
//STAssertNotNULL(dli.dli_sname, @"Symbol name was stripped!");
if (dli.dli_sname == NULL) {
dli.dli_sname = __PRETTY_FUNCTION__;
NSLog(@"WARNING: dladdr() returned a NULL symbol name; this appears to be an iOS 9 bug.");
}
STAssertNotNULL(dli.dli_sname, @"Symbol name was stripped!");

/* Now walk the Mach-O table ourselves */
plcrash_async_macho_symtab_reader_t reader;
Expand Down Expand Up @@ -406,11 +401,6 @@ - (void) testFindSymbol {
IMP localIMP = class_getMethodImplementation([self class], _cmd);
Dl_info dli;
STAssertTrue(dladdr((void *)localIMP, &dli) != 0, @"Failed to look up symbol");
// XXX-TODO-DLADDR
if (dli.dli_sname == NULL) {
dli.dli_sname = __PRETTY_FUNCTION__;
NSLog(@"WARNING: dladdr() returned a NULL symbol name; this appears to be an iOS 9 bug.");
}

/* Compare the results */
STAssertEqualCStrings(dli.dli_sname, ctx.name, @"Returned incorrect symbol name");
Expand All @@ -425,11 +415,6 @@ - (void) testFindSymbolByName {
IMP localIMP = class_getMethodImplementation([self class], _cmd);
Dl_info dli;
STAssertTrue(dladdr((void *)localIMP, &dli) != 0, @"Failed to look up symbol");
// XXX-TODO-DLADDR
if (dli.dli_sname == NULL) {
dli.dli_sname = __PRETTY_FUNCTION__;
NSLog(@"WARNING: dladdr() returned a NULL symbol name; this appears to be an iOS 9 bug.");
}

/* Perform our symbol lookup */
pl_vm_address_t pc;
Expand Down

0 comments on commit 6b0bb72

Please sign in to comment.