Fix TestLoadUnload.test_load_unload for android API > 21

[tberghammer]

Summary

Fix TestLoadUnload.test_load_unload for android API > 21

• Change Module::MatchesModuleSpec to return true in case the file spec in the specified module spec matches with the platform file spec, but not with the local file spec
• Change the module_resolver used when resolving a remote shared module to always set the platform file spec to the file spec requested

[ovyalov]

LGTM

source/Core/Module.cpp

1712 ↗

(On Diff #33949)

It might expose some tricky problems when host and target have the same library with the same path but different content.. - please make sure that there is no regressions.

source/Target/Platform.cpp

278 ↗

(On Diff #33949)

What do you think about putting module_sp->SetPlatformFileSpec(spec.GetFileSpec()) into ModuleList::GetSharedModule ?

[tberghammer]

source/Core/Module.cpp

1712 ↗

(On Diff #33949)

I run the test suit and seen no regression.

If we have a library with the same path on the host and on the target and we don't have UUID then we are already having issues differentiating between them. In the case you described we treat them as matching modules even before my change.

source/Target/Platform.cpp

278 ↗

(On Diff #33949)

I would like to limit the scope of this change to the case when remote debugging is used. It can be confusing if we set platform file spec even when no remote platform is involved

lldb/trunk/source/Core/Module.cpp

if (uuid.IsValid())
             return true;
         else
             return false;
     }
     
     const FileSpec &file_spec = module_ref.GetFileSpec();
     if (file_spec)
     {
-        if (!FileSpec::Equal (file_spec, m_file, (bool)file_spec.GetDirectory()))
+        if (!FileSpec::Equal (file_spec, m_file, (bool)file_spec.GetDirectory()) &&
+            !FileSpec::Equal (file_spec, m_platform_file, (bool)file_spec.GetDirectory()))
             return false;
     }
 
     const FileSpec &platform_file_spec = module_ref.GetPlatformFileSpec();
     if (platform_file_spec)
     {
         if (!FileSpec::Equal (platform_file_spec, GetPlatformFileSpec (), (bool)platform_file_spec.GetDirectory()))
             return false;

lldb/trunk/source/Target/Platform.cpp

if (IsHost ())
                                             did_create_ptr,
                                             false);
 
     return GetRemoteSharedModule (module_spec,
                                   process,
                                   module_sp,
                                   [&](const ModuleSpec &spec)
                                   {
-                                      return ModuleList::GetSharedModule (
+                                      Error error = ModuleList::GetSharedModule (
                                           spec, module_sp, module_search_paths_ptr, old_module_sp_ptr, did_create_ptr, false);
+                                      if (error.Success() && module_sp)
+                                          module_sp->SetPlatformFileSpec(spec.GetFileSpec());
+                                      return error;
                                   },
                                   did_create_ptr);
 }
 
 bool
 Platform::GetModuleSpec (const FileSpec& module_file_spec,
                          const ArchSpec& arch,
                          ModuleSpec &module_spec)