https://github.com/kastiglione created https://github.com/llvm/llvm-project/pull/154574
None >From 13264919452f446dd13f5f8a3e3ed207e84bf96b Mon Sep 17 00:00:00 2001 From: Dave Lee <davelee....@gmail.com> Date: Wed, 20 Aug 2025 09:41:26 -0700 Subject: [PATCH] [lldb] Tweak check for CommandLineTools in ParseXcodeSDK --- lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp index 9958af26379b9..163cc19943683 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp @@ -8,6 +8,7 @@ #include "SymbolFileDWARF.h" #include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/StringRef.h" #include "llvm/DebugInfo/DWARF/DWARFAddressRange.h" #include "llvm/DebugInfo/DWARF/DWARFDebugLoc.h" #include "llvm/Support/Casting.h" @@ -998,12 +999,12 @@ XcodeSDK SymbolFileDWARF::ParseXcodeSDK(CompileUnit &comp_unit) { const char *sdk = cu_die.GetAttributeValueAsString(DW_AT_APPLE_sdk, nullptr); if (!sdk) return {}; - std::string sysroot = + llvm::StringRef sysroot = cu_die.GetAttributeValueAsString(DW_AT_LLVM_sysroot, ""); // RegisterXcodeSDK calls into xcrun which is not aware of CLT, which is // expensive. - if (sysroot.find("/Library/Developer/CommandLineTools/SDKs") != 0) { + if (!sysroot.starts_with("/Library/Developer/CommandLineTools/SDKs")) { // Register the sysroot path remapping with the module belonging to // the CU as well as the one belonging to the symbol file. The two // would be different if this is an OSO object and module is the _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits