I have a feeling this breaks something, but I'm not sure what.  I remember specifically needing this for some reason.<br><br>Did you verify that the gtest suite as well as the dotest suite and the interactive interpreter all still pass / work?<br><div class="gmail_quote"><div dir="ltr">On Mon, Apr 11, 2016 at 6:14 PM Enrico Granata via lldb-commits <<a href="mailto:lldb-commits@lists.llvm.org">lldb-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: enrico<br>
Date: Mon Apr 11 20:08:35 2016<br>
New Revision: 266033<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=266033&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=266033&view=rev</a><br>
Log:<br>
Restore the lazy initialization of ScriptInterpreterPython, which was lost as part of the SystemLifetimeManager work<br>
<br>
<br>
Modified:<br>
    lldb/trunk/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp<br>
    lldb/trunk/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h<br>
<br>
Modified: lldb/trunk/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp?rev=266033&r1=266032&r2=266033&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp?rev=266033&r1=266032&r2=266033&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp (original)<br>
+++ lldb/trunk/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp Mon Apr 11 20:08:35 2016<br>
@@ -274,8 +274,8 @@ ScriptInterpreterPython::ScriptInterpret<br>
     m_lock_count(0),<br>
     m_command_thread_state(nullptr)<br>
 {<br>
-    assert(g_initialized && "ScriptInterpreterPython created but InitializePrivate has not been called!");<br>
-<br>
+    InitializePrivate();<br>
+<br>
     m_dictionary_name.append("_dict");<br>
     StreamString run_string;<br>
     run_string.Printf ("%s = dict()", m_dictionary_name.c_str());<br>
@@ -330,8 +330,6 @@ ScriptInterpreterPython::Initialize()<br>
<br>
     std::call_once(g_once_flag, []()<br>
     {<br>
-        InitializePrivate();<br>
-<br>
         PluginManager::RegisterPlugin(GetPluginNameStatic(),<br>
                                       GetPluginDescriptionStatic(),<br>
                                       lldb::eScriptLanguagePython,<br>
@@ -3097,7 +3095,9 @@ ScriptInterpreterPython::InitializeInter<br>
 void<br>
 ScriptInterpreterPython::InitializePrivate ()<br>
 {<br>
-    assert(!g_initialized && "ScriptInterpreterPython::InitializePrivate() called more than once!");<br>
+    if (g_initialized)<br>
+        return;<br>
+<br>
     g_initialized = true;<br>
<br>
     Timer scoped_timer (__PRETTY_FUNCTION__, __PRETTY_FUNCTION__);<br>
<br>
Modified: lldb/trunk/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h?rev=266033&r1=266032&r2=266033&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h?rev=266033&r1=266032&r2=266033&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h (original)<br>
+++ lldb/trunk/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h Mon Apr 11 20:08:35 2016<br>
@@ -372,9 +372,6 @@ public:<br>
     void ResetOutputFileHandle(FILE *new_fh) override;<br>
<br>
     static void<br>
-    InitializePrivate ();<br>
-<br>
-    static void<br>
     InitializeInterpreter (SWIGInitCallback python_swig_init_callback,<br>
                            SWIGBreakpointCallbackFunction swig_breakpoint_callback,<br>
                            SWIGWatchpointCallbackFunction swig_watchpoint_callback,<br>
@@ -507,6 +504,9 @@ public:<br>
     };<br>
<br>
 protected:<br>
+    static void<br>
+    InitializePrivate ();<br>
+<br>
     class SynchronicityHandler<br>
     {<br>
     private:<br>
<br>
<br>
_______________________________________________<br>
lldb-commits mailing list<br>
<a href="mailto:lldb-commits@lists.llvm.org" target="_blank">lldb-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits</a><br>
</blockquote></div>