labath created this revision. labath added a reviewer: tberghammer. labath added a subscriber: lldb-commits. Herald added subscribers: danalbert, tberghammer.
The vdso is full of hand-written assembly which the instruction emulator has a hard time understanding. Luckily, the kernel already provides us with correct unwind info for them. So let's use it. This fixes (at least) the AssertingInferiorTestCase.test_inferior_asserting_disassemble test on android N i386. https://reviews.llvm.org/D24079 Files: source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h Index: source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h =================================================================== --- source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h +++ source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h @@ -172,6 +172,9 @@ void ResolveExecutableModule(lldb::ModuleSP &module_sp); + bool + AlwaysRelyOnEHUnwindInfo(lldb_private::SymbolContext &sym_ctx) override; + private: DISALLOW_COPY_AND_ASSIGN(DynamicLoaderPOSIXDYLD); }; Index: source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp =================================================================== --- source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp +++ source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp @@ -7,8 +7,12 @@ // //===----------------------------------------------------------------------===// -// C Includes -// C++ Includes +// Main header include +#include "DynamicLoaderPOSIXDYLD.h" + +// Project includes +#include "AuxVector.h" + // Other libraries and framework includes #include "lldb/Core/PluginManager.h" #include "lldb/Core/Log.h" @@ -22,9 +26,10 @@ #include "lldb/Target/Thread.h" #include "lldb/Target/ThreadPlanRunToAddress.h" #include "lldb/Breakpoint/BreakpointLocation.h" +#include "lldb/Symbol/Function.h" -#include "AuxVector.h" -#include "DynamicLoaderPOSIXDYLD.h" +// C++ Includes +// C Includes using namespace lldb; using namespace lldb_private; @@ -691,3 +696,17 @@ target.SetExecutableModule (module_sp, false); } + +bool +DynamicLoaderPOSIXDYLD::AlwaysRelyOnEHUnwindInfo(lldb_private::SymbolContext &sym_ctx) +{ + ModuleSP module_sp; + if (sym_ctx.symbol) + module_sp = sym_ctx.symbol->GetAddressRef().GetModule(); + if (!module_sp && sym_ctx.function) + module_sp = sym_ctx.function->GetAddressRange().GetBaseAddress().GetModule(); + if (!module_sp) + return false; + + return module_sp->GetFileSpec().GetPath() == "[vdso]"; +}
Index: source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h =================================================================== --- source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h +++ source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h @@ -172,6 +172,9 @@ void ResolveExecutableModule(lldb::ModuleSP &module_sp); + bool + AlwaysRelyOnEHUnwindInfo(lldb_private::SymbolContext &sym_ctx) override; + private: DISALLOW_COPY_AND_ASSIGN(DynamicLoaderPOSIXDYLD); }; Index: source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp =================================================================== --- source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp +++ source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp @@ -7,8 +7,12 @@ // //===----------------------------------------------------------------------===// -// C Includes -// C++ Includes +// Main header include +#include "DynamicLoaderPOSIXDYLD.h" + +// Project includes +#include "AuxVector.h" + // Other libraries and framework includes #include "lldb/Core/PluginManager.h" #include "lldb/Core/Log.h" @@ -22,9 +26,10 @@ #include "lldb/Target/Thread.h" #include "lldb/Target/ThreadPlanRunToAddress.h" #include "lldb/Breakpoint/BreakpointLocation.h" +#include "lldb/Symbol/Function.h" -#include "AuxVector.h" -#include "DynamicLoaderPOSIXDYLD.h" +// C++ Includes +// C Includes using namespace lldb; using namespace lldb_private; @@ -691,3 +696,17 @@ target.SetExecutableModule (module_sp, false); } + +bool +DynamicLoaderPOSIXDYLD::AlwaysRelyOnEHUnwindInfo(lldb_private::SymbolContext &sym_ctx) +{ + ModuleSP module_sp; + if (sym_ctx.symbol) + module_sp = sym_ctx.symbol->GetAddressRef().GetModule(); + if (!module_sp && sym_ctx.function) + module_sp = sym_ctx.function->GetAddressRange().GetBaseAddress().GetModule(); + if (!module_sp) + return false; + + return module_sp->GetFileSpec().GetPath() == "[vdso]"; +}
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits