commit 777fcecf8f3a8697053f9039de692ddd81720b69
author Jason Molenda <jmolenda@apple.com> Sat Jan 21 01:17:36 2017 +0000
committer Jason Molenda <jmolenda@apple.com> Sat Jan 21 01:17:36 2017 +0000
tree d4732ba1362327e93f9ac29a127fc24ebf356ab7
parent 963ffd6485eb87212a01a01d6de393a2cf442e22

Add a catch-all line for detecting dyld in the inferior process
shlibs so we don't miss dyld.
<rdar://problem/30128580> 

llvm-svn: 292696

lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp

diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
index bd0e772..0c4fe2a 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
@@ -542,6 +542,10 @@
           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;
     }

lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp

diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp
index 0f8b190..4913edd 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp
@@ -139,6 +139,7 @@
 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;
   }
 }