diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.cpp --- a/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.cpp +++ b/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.cpp @@ -106,6 +106,7 @@ static void MaybeBuildIdToBuffer(const AddressInfo &info, bool PrefixSpace, InternalScopedString *buffer) { +#if !SANITIZER_APPLE if (info.uuid_size) { if (PrefixSpace) buffer->append(" "); @@ -115,6 +116,7 @@ } buffer->append(")"); } +#endif } static const char kDefaultFormat[] = " #%n %p %F %L"; diff --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_stacktrace_printer_test.cpp b/compiler-rt/lib/sanitizer_common/tests/sanitizer_stacktrace_printer_test.cpp --- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_stacktrace_printer_test.cpp +++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_stacktrace_printer_test.cpp @@ -123,15 +123,27 @@ RenderFrame(&str, "%M", frame_no, info.address, &info, false); EXPECT_NE(nullptr, internal_strstr(str.data(), "(module+0x")); EXPECT_NE(nullptr, internal_strstr(str.data(), "200")); +#if SANITIZER_APPLE + EXPECT_EQ(nullptr, internal_strstr(str.data(), "BuildId: 5566")); +#else EXPECT_NE(nullptr, internal_strstr(str.data(), "BuildId: 5566")); +#endif str.clear(); RenderFrame(&str, "%L", frame_no, info.address, &info, false); +#if SANITIZER_APPLE + EXPECT_STREQ("(/path/to/module+0x200)", str.data()); +#else EXPECT_STREQ("(/path/to/module+0x200) (BuildId: 5566)", str.data()); +#endif str.clear(); RenderFrame(&str, "%b", frame_no, info.address, &info, false); +#if SANITIZER_APPLE + EXPECT_STREQ("", str.data()); +#else EXPECT_STREQ("(BuildId: 5566)", str.data()); +#endif str.clear(); info.function = internal_strdup("my_function");