[Lldb-commits] [PATCH] D12601: Fix TestLoadUnload.test_load_unload for android API > 21
Tamas Berghammer via lldb-commits
lldb-commits at lists.llvm.org
Fri Sep 4 05:44:03 PDT 2015
This revision was automatically updated to reflect the committed changes.
Closed by commit rL246852: Fix TestLoadUnload.test_load_unload for android API > 21 (authored by tberghammer).
Changed prior to commit:
http://reviews.llvm.org/D12601?vs=33949&id=34025#toc
Repository:
rL LLVM
http://reviews.llvm.org/D12601
Files:
lldb/trunk/source/Core/Module.cpp
lldb/trunk/source/Target/Platform.cpp
Index: lldb/trunk/source/Core/Module.cpp
===================================================================
--- lldb/trunk/source/Core/Module.cpp
+++ lldb/trunk/source/Core/Module.cpp
@@ -1708,7 +1708,8 @@
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;
}
Index: lldb/trunk/source/Target/Platform.cpp
===================================================================
--- lldb/trunk/source/Target/Platform.cpp
+++ lldb/trunk/source/Target/Platform.cpp
@@ -272,8 +272,11 @@
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);
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D12601.34025.patch
Type: text/x-patch
Size: 1554 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20150904/e6cf9979/attachment.bin>
More information about the lldb-commits
mailing list