[Lldb-commits] [lldb] r145472 - /lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp

[Jim Ingham]

Author: jingham
Date: Tue Nov 29 21:15:08 2011
New Revision: 145472

URL: http://llvm.org/viewvc/llvm-project?rev=145472&view=rev
Log:
Turn off the resolver detection till we find a better method to do so.

Modified:
    lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp

Modified: lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp?rev=145472&r1=145471&r2=145472&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp Tue Nov 29 21:15:08 2011
@@ -1454,7 +1454,12 @@
                 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)
                 {