Author: Jonas Devlieghere Date: 2021-02-18T10:38:54-08:00 New Revision: 612384f6e01194a4689b6663f039145b3d01ddce
URL: https://github.com/llvm/llvm-project/commit/612384f6e01194a4689b6663f039145b3d01ddce DIFF: https://github.com/llvm/llvm-project/commit/612384f6e01194a4689b6663f039145b3d01ddce.diff LOG: [lldb] Remove unused code in ScriptInterpreterPython Remove the unused code I noticed when working on d6e80578fc5e and do some other minor cleanups in the vicinity. Added: Modified: lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp index 68409b724905..b3f72066195b 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp @@ -2877,7 +2877,7 @@ bool ScriptInterpreterPythonImpl::LoadScriptingModule( bool does_contain = false; // this call will succeed if the module was ever imported in any Debugger // in the lifetime of the process in which this LLDB framework is living - bool was_imported_globally = + const bool was_imported_globally = (ExecuteOneLineWithReturn( command_stream.GetData(), ScriptInterpreterPythonImpl::eScriptReturnTypeBool, &does_contain, @@ -2885,20 +2885,15 @@ bool ScriptInterpreterPythonImpl::LoadScriptingModule( .SetEnableIO(false) .SetSetLLDBGlobals(false)) && does_contain); - // this call will fail if the module was not imported in this Debugger - // before - command_stream.Clear(); - command_stream.Printf("sys.getrefcount(%s)", module_name.c_str()); - bool was_imported_locally = GetSessionDictionary() - .GetItemForKey(PythonString(module_name)) - .IsAllocated(); - - bool was_imported = (was_imported_globally || was_imported_locally); + const bool was_imported_locally = + GetSessionDictionary() + .GetItemForKey(PythonString(module_name)) + .IsAllocated(); // now actually do the import command_stream.Clear(); - if (was_imported) { + if (was_imported_globally || was_imported_locally) { if (!was_imported_locally) command_stream.Printf("import %s ; reload_module(%s)", module_name.c_str(), module_name.c_str()); _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
