Author: Sam James Date: 2024-01-30T15:47:38-08:00 New Revision: 400a02bb281ba0de79211ab53d931e44dd76733f
URL: https://github.com/llvm/llvm-project/commit/400a02bb281ba0de79211ab53d931e44dd76733f DIFF: https://github.com/llvm/llvm-project/commit/400a02bb281ba0de79211ab53d931e44dd76733f.diff LOG: [sanitizer] Handle Gentoo's libstdc++ path On Gentoo, libc++ is indeed in /usr/include/c++/*, but libstdc++ is at e.g. /usr/lib/gcc/x86_64-pc-linux-gnu/14/include/g++-v14. Use '/include/g++' as it should be unique enough. Note that the omission of a trailing slash is intentional to match g++-*. See https://github.com/llvm/llvm-project/pull/78534#issuecomment-1904145839. Reviewed by: mgorny Closes: https://github.com/llvm/llvm-project/pull/79264 Signed-off-by: Sam James <s...@gentoo.org> (cherry picked from commit e8f882f83acf30d9b4da8846bd26314139660430) Added: Modified: compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_report.cpp Removed: ################################################################################ diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_report.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_report.cpp index 8438e019591b5..f6b157c07c655 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_report.cpp +++ b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_report.cpp @@ -34,8 +34,10 @@ static bool FrameIsInternal(const SymbolizedStack *frame) { return true; const char *file = frame->info.file; const char *module = frame->info.module; + // On Gentoo, the path is g++-*, so there's *not* a missing /. if (file && (internal_strstr(file, "/compiler-rt/lib/") || - internal_strstr(file, "/include/c++/"))) + internal_strstr(file, "/include/c++/") || + internal_strstr(file, "/include/g++"))) return true; if (module && (internal_strstr(module, "libclang_rt."))) return true; _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits