From 5a14c543c735d308fb799e1e4eb214d26a7db945 Mon Sep 17 00:00:00 2001 From: Jim Ingham Date: Wed, 30 Nov 2011 03:15:08 +0000 Subject: [PATCH] Turn off the resolver detection till we find a better method to do so. llvm-svn: 145472 --- .../DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp index acdc42f4cc30..15540168b6a0 100644 --- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp +++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp @@ -1454,7 +1454,12 @@ DynamicLoaderMacOSXDYLD::GetStepThroughTrampolinePlan (Thread &thread, bool stop images.FindSymbolsWithNameAndType(trampoline_name, eSymbolTypeCode, target_symbols); size_t num_original_symbols = target_symbols.GetSize(); - bool orig_is_resolver = (current_symbol->GetFlags() & MACH_O_N_SYMBOL_RESOLVER) == MACH_O_N_SYMBOL_RESOLVER; + // FIXME: The resolver symbol is only valid in object files. In binaries it is reused for the + // shared library slot number. So we'll have to look this up in the dyld info. + // For now, just turn this off. + + // bool orig_is_resolver = (current_symbol->GetFlags() & MACH_O_N_SYMBOL_RESOLVER) == MACH_O_N_SYMBOL_RESOLVER; + bool orig_is_resolver = false; if (num_original_symbols > 0) {