caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the managing of the session dictionary when you have nested wrappers (#132846)

Browse Source 
Since the inner wrapper call might have removed one of the entries from
the global dict that the outer wrapper ALSO was going to delete, make
sure that we check that the key is still in the global dict before
trying to act on it.
This commit is contained in:
jimingham
2025-03-25 09:56:58 -07:00
committed by GitHub
parent 0919ab3cb6
commit 870463519b
5 changed files with 115 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
View File

@@ -1267,6 +1267,8 @@ Status ScriptInterpreterPythonImpl::ExportFunctionDefinitionToInterpreter(
StringList &function_def) {
// Convert StringList to one long, newline delimited, const char *.
std::string function_def_string(function_def.CopyList());
LLDB_LOG(GetLog(LLDBLog::Script), "Added Function:\n%s\n",
function_def_string.c_str());
Status error = ExecuteMultipleLines(
function_def_string.c_str(), ExecuteScriptOptions().SetEnableIO(false));
@@ -1336,13 +1338,15 @@ Status ScriptInterpreterPythonImpl::GenerateFunction(const char *signature,
" for key in new_keys:"); // Iterate over all the keys from session
// dict
auto_generated_function.AppendString(
" internal_dict[key] = global_dict[key]"); // Update session dict
// values
" if key in old_keys:"); // If key was originally in
// global dict
auto_generated_function.AppendString(
" if key not in old_keys:"); // If key was not originally in
// global dict
" internal_dict[key] = global_dict[key]"); // Update it
auto_generated_function.AppendString(
" del global_dict[key]"); // ...then remove key/value from
" elif key in global_dict:"); // Then if it is still in the
// global dict
auto_generated_function.AppendString(
" del global_dict[key]"); // remove key/value from the
// global dict
auto_generated_function.AppendString(
" return __return_val"); // Return the user callback return value.