[lldb] Properly handle locate module callback when Target change arch

[GeorgeHuyubo]

Since this PR: #141670 We started to override the Platform/Arch for a target if needed. However we may have already registered locate module callback with the old platform.

This PR will move the locate module callback to the new Platform whenever Target changes architecture.

[llvmbot]

@llvm/pr-subscribers-lldb

Author: None (GeorgeHuyubo)

Changes

Since this PR: #141670

We start to override the Platform/Arch for a target if needed. However we may have already registered locate module callback with the old platform. So this fix will just ensure to set the callback to the new platform object.

---

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

1 Files Affected:

• (modified) lldb/source/Target/Target.cpp (+2)

diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp
index 9660fc97970b0..45a9e1196a049 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -1706,6 +1706,8 @@ bool Target::SetArchitecture(const ArchSpec &arch_spec, bool set_platform,
         if (PlatformSP arch_platform_sp =
                 GetDebugger().GetPlatformList().GetOrCreate(other, {},
                                                             &platform_arch)) {
+          arch_platform_sp->SetLocateModuleCallback(
+              platform_sp->GetLocateModuleCallback());
           SetPlatform(arch_platform_sp);
           if (platform_arch.IsValid())
             other = platform_arch;

[Jlalond]

This makes sense to me. Let's update the PR description to explain whenever Target changes architecture we mvoe any corresponding platform Module callback, because that wasn't really apparent to me from reading the summary.

[clayborg]

This almost seems like the SetLocateModuleCallback should be on the target instead of on the platform. But this will work around the issue for sure.