Restore the lazy initialization of ScriptInterpreterPython, which was lost as part of the SystemLifetimeManager work

llvm-svn: 266033
This commit is contained in:
Enrico Granata
2016-04-12 01:08:35 +00:00
parent 278199f615
commit b184bfa13b
2 changed files with 8 additions and 8 deletions

View File

@@ -274,8 +274,8 @@ ScriptInterpreterPython::ScriptInterpreterPython(CommandInterpreter &interpreter
m_lock_count(0),
m_command_thread_state(nullptr)
{
assert(g_initialized && "ScriptInterpreterPython created but InitializePrivate has not been called!");
InitializePrivate();
m_dictionary_name.append("_dict");
StreamString run_string;
run_string.Printf ("%s = dict()", m_dictionary_name.c_str());
@@ -330,8 +330,6 @@ ScriptInterpreterPython::Initialize()
std::call_once(g_once_flag, []()
{
InitializePrivate();
PluginManager::RegisterPlugin(GetPluginNameStatic(),
GetPluginDescriptionStatic(),
lldb::eScriptLanguagePython,
@@ -3097,7 +3095,9 @@ ScriptInterpreterPython::InitializeInterpreter (SWIGInitCallback swig_init_callb
void
ScriptInterpreterPython::InitializePrivate ()
{
assert(!g_initialized && "ScriptInterpreterPython::InitializePrivate() called more than once!");
if (g_initialized)
return;
g_initialized = true;
Timer scoped_timer (__PRETTY_FUNCTION__, __PRETTY_FUNCTION__);