[LLDB] Fix remote executables load and caching (#98623)

dzhidzhoev · web-flow · commit 73dad7a76522 · 2024-07-12T20:43:08.000+02:00
Seemingly, #96256 removed the only call to Platform::GetCachedExecutable, which broke the resolution of executable modules in the remote debugging mode (#97410). This commit fixes that.
diff --git a/lldb/source/Target/Platform.cpp b/lldb/source/Target/Platform.cpp
@@ -1446,7 +1446,8 @@ Platform::GetCachedExecutable(ModuleSpec &module_spec,
   Status error = GetRemoteSharedModule(
       module_spec, nullptr, module_sp,
       [&](const ModuleSpec &spec) {
-        return ResolveExecutable(spec, module_sp, module_search_paths_ptr);
+        return Platform::ResolveExecutable(spec, module_sp,
+                                           module_search_paths_ptr);
       },
       nullptr);
   if (error.Success()) {
diff --git a/lldb/source/Target/RemoteAwarePlatform.cpp b/lldb/source/Target/RemoteAwarePlatform.cpp
@@ -46,6 +46,9 @@ Status RemoteAwarePlatform::ResolveExecutable(
 
     if (!FileSystem::Instance().Exists(resolved_file_spec))
       FileSystem::Instance().ResolveExecutableLocation(resolved_file_spec);
+  } else if (m_remote_platform_sp) {
+    return GetCachedExecutable(resolved_module_spec, exe_module_sp,
+                               module_search_paths_ptr);
   }
 
   return Platform::ResolveExecutable(resolved_module_spec, exe_module_sp,

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,9 @@ Status RemoteAwarePlatform::ResolveExecutable(`
`46`	`46`
`47`	`47`	`if (!FileSystem::Instance().Exists(resolved_file_spec))`
`48`	`48`	`FileSystem::Instance().ResolveExecutableLocation(resolved_file_spec);`
	`49`	`+ } else if (m_remote_platform_sp) {`
	`50`	`+ return GetCachedExecutable(resolved_module_spec, exe_module_sp,`
	`51`	`+ module_search_paths_ptr);`
`49`	`52`	`}`
`50`	`53`
`51`	`54`	`return Platform::ResolveExecutable(resolved_module_spec, exe_module_sp,`