[lldb][NFC] Inline ResolveSDKPathFromDebugInfo in one of its call site

[charles-zablit]

This patch is part of an effort to remove the ResolveSDKPathFromDebugInfo method, and more specifically the variant which takes a Module as argument.

See the following PR for a follow up on what to do:

• [lldb][darwin] force BuiltinHeadersInSystemModules to be always false #144913.

[llvmbot]

@llvm/pr-subscribers-lldb

Author: Charles Zablit (charles-zablit)

Changes

This patch is part of an effort to remove the ResolveSDKPathFromDebugInfo method, and more specifically the variant which takes a Module as argument.

This PR should be merged after #144913.

---

Full diff: https://github.com/llvm/llvm-project/pull/146062.diff

1 Files Affected:

• (modified) lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp (+26-6)

diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
index 262a7dc731713..ae46ac63e756a 100644
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
@@ -1130,13 +1130,33 @@ void PlatformDarwin::AddClangModuleCompilationOptionsForSDKType(
 
   if (target) {
     if (ModuleSP exe_module_sp = target->GetExecutableModule()) {
-      auto path_or_err = ResolveSDKPathFromDebugInfo(*exe_module_sp);
-      if (path_or_err) {
-        sysroot_spec = FileSpec(*path_or_err);
+      SymbolFile *sym_file = exe_module_sp->GetSymbolFile();
+      if (!sym_file)
+        return;
+
+      XcodeSDK merged_sdk;
+      for (unsigned i = 0; i < sym_file->GetNumCompileUnits(); ++i) {
+        if (auto cu_sp = sym_file->GetCompileUnitAtIndex(i)) {
+          auto cu_sdk = sym_file->ParseXcodeSDK(*cu_sp);
+          merged_sdk.Merge(cu_sdk);
+        }
+      }
+
+      // TODO: The result of this loop is almost equivalent to deriving the SDK
+      // from the target triple, which would be a lot cheaper.
+
+      if (FileSystem::Instance().Exists(merged_sdk.GetSysroot())) {
+        sysroot_spec = merged_sdk.GetSysroot();
       } else {
-        LLDB_LOG_ERROR(GetLog(LLDBLog::Types | LLDBLog::Host),
-                       path_or_err.takeError(),
-                       "Failed to resolve SDK path: {0}");
+        auto path_or_err =
+            HostInfo::GetSDKRoot(HostInfo::SDKOptions{merged_sdk});
+        if (path_or_err) {
+          sysroot_spec = FileSpec(*path_or_err);
+        } else {
+          LLDB_LOG_ERROR(GetLog(LLDBLog::Types | LLDBLog::Host),
+                         path_or_err.takeError(),
+                         "Failed to resolve SDK path: {0}");
+        }
       }
     }
   }

[Michael137]

Can we put all of this into a static helper in this file? Maybe call it ResolveSDKPathFromDebugInfo too

[charles-zablit]

Extracted and refactored the logic a bit to ResolveSDKPathFromDebugInfo 👍

[Michael137]

Don't think we want to return here? We used to just to log the error. How about we return llvm::Expected from ResolveSDKPathFromDebugInfo and don't pass the sysroot_spec as an output parameter?

[charles-zablit]

I fixed the logic and switched to an llvm::Expected return type. The underlying error are logged after the function is called.

[Michael137]

LGTM, just some final stylistic comments

[Michael137]

Minor nit: I would invert this condition and return error if !path_or_err.

Then return FileSpec(*path_or_err) as the last return from this function. So we're consistent with all the other early returns in this function

[Michael137]

We don't need this to be in the header. We can just make it local to the .cpp file

[adrian-prantl]

LGTM with Michael's comments addressed.