[Lldb-commits] [lldb] r263602 - Only try to load the OS plug-in after a shared library load if we don't already have one.

[Greg Clayton via lldb-commits]

Author: gclayton
Date: Tue Mar 15 17:44:07 2016
New Revision: 263602

URL: http://llvm.org/viewvc/llvm-project?rev=263602&view=rev
Log:
Only try to load the OS plug-in after a shared library load if we don't already 
have one.

<rdar://problem/24162686>


Modified:
    lldb/trunk/source/Target/Process.cpp

Modified: lldb/trunk/source/Target/Process.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Process.cpp?rev=263602&r1=263601&r2=263602&view=diff
==============================================================================
--- lldb/trunk/source/Target/Process.cpp (original)
+++ lldb/trunk/source/Target/Process.cpp Tue Mar 15 17:44:07 2016
@@ -6410,7 +6410,10 @@ Process::ModulesDidLoad (ModuleList &mod
             language_runtime_sp->ModulesDidLoad(module_list);
     }
 
-    LoadOperatingSystemPlugin(false);
+    // If we don't have an operating system plug-in, try to load one since
+    // loading shared libraries might cause a new one to try and load
+    if (!m_os_ap)
+        LoadOperatingSystemPlugin(false);
 }
 
 void


_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits