[Lldb-commits] [lldb] r292696 - Add a catch-all line for detecting dyld in the inferior process

[Jason Molenda via lldb-commits]

Author: jmolenda
Date: Fri Jan 20 19:17:36 2017
New Revision: 292696

URL: http://llvm.org/viewvc/llvm-project?rev=292696&view=rev
Log:
Add a catch-all line for detecting dyld in the inferior process
shlibs so we don't miss dyld.
<rdar://problem/30128580> 

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

Modified: lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp?rev=292696&r1=292695&r2=292696&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp Fri Jan 20 19:17:36 2017
@@ -542,6 +542,10 @@ void DynamicLoaderDarwin::UpdateSpecialB
           dyld_idx = i;
         }
       }
+      else {
+        // catch-all for any other environment -- trust that dyld is actually dyld
+        dyld_idx = i;
+      }
     } else if (image_infos[i].header.filetype == llvm::MachO::MH_EXECUTE) {
       exe_idx = i;
     }

Modified: lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp?rev=292696&r1=292695&r2=292696&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp Fri Jan 20 19:17:36 2017
@@ -139,6 +139,7 @@ bool DynamicLoaderMacOS::DidSetNotificat
 void DynamicLoaderMacOS::ClearNotificationBreakpoint() {
   if (LLDB_BREAK_ID_IS_VALID(m_break_id)) {
     m_process->GetTarget().RemoveBreakpointByID(m_break_id);
+    m_break_id = LLDB_INVALID_BREAK_ID;
   }
 }