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 @@ -198,7 +198,9 @@ RenderModuleLocation(buffer, info->module, info->module_offset, info->module_arch, strip_path_prefix); +#if !SANITIZER_APPLE MaybeBuildIdToBuffer(*info, /*PrefixSpace=*/true, buffer); +#endif } else { buffer->append("()"); } 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 @@ -126,9 +126,15 @@ EXPECT_NE(nullptr, internal_strstr(str.data(), "BuildId: 5566")); str.clear(); +#if SANITIZER_APPLE + RenderFrame(&str, "%L", frame_no, info.address, &info, false); + EXPECT_STREQ("(/path/to/module+0x200)", str.data()); + str.clear(); +#else RenderFrame(&str, "%L", frame_no, info.address, &info, false); EXPECT_STREQ("(/path/to/module+0x200) (BuildId: 5566)", str.data()); str.clear(); +#endif RenderFrame(&str, "%b", frame_no, info.address, &info, false); EXPECT_STREQ("(BuildId: 5566)", str.data());