From a07287ecc5e333217f378cbb3f3d885ead69dd13 Mon Sep 17 00:00:00 2001 From: Alex Langford Date: Wed, 20 Feb 2019 23:12:56 +0000 Subject: [PATCH] Merge target triple into module triple when constructing module from memory Summary: While debugging an android process remotely from a windows machine, I noticed that the modules constructed from an object file in memory only had information about the architecture. Without knowledge of the OS or environment, expression evaluation sometimes leads to incorrectly generated code or a debugger crash. While we cannot know for certain what triple a module constructed from an in-memory object file will have, we can use the triple from the target to try and fill in the missing details. Reviewers: clayborg, zturner, JDevlieghere, compnerd, aprantl, labath Subscribers: jdoerfert, lldb-commits Differential Revision: https://reviews.llvm.org/D58405 llvm-svn: 354526 --- lldb/source/Core/Module.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp index d247e6eb1760..8ff01cb2560d 100644 --- a/lldb/source/Core/Module.cpp +++ b/lldb/source/Core/Module.cpp @@ -309,6 +309,10 @@ ObjectFile *Module::GetMemoryObjectFile(const lldb::ProcessSP &process_sp, // file's architecture since it might differ in vendor/os if some // parts were unknown. m_arch = m_objfile_sp->GetArchitecture(); + + // Augment the arch with the target's information in case + // we are unable to extract the os/environment from memory. + m_arch.MergeFrom(process_sp->GetTarget().GetArchitecture()); } else { error.SetErrorString("unable to find suitable object file plug-in"); }