intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-20 01:58:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

[lldb] Use current execution context in SBDebugger

Browse Source 
Use `GetSelectedExecutionContext()` instead of
`GetCommandInterpreter().GetExecutionContext()` in
`SBDebugger::GetInternalVariableValue/SBDebugger::SetInternalVariable`. The
execution context in the command interpreter might be empty, if no commands has
been executed yet (it is updated only when handling commands or completions --
e.g.
https://github.com/llvm/llvm-project/blob/main/lldb/source/Interpreter/CommandInterpreter.cpp#L1855).

Reviewed By: teemperor

Differential Revision: https://reviews.llvm.org/D95761
This commit is contained in:
Andy Yankovsky
2021-02-01 12:25:53 +01:00
committed by Raphael Isemann
parent eefa8a9ff8
commit 754ab803b8
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lldb/source/API/SBDebugger.cpp
View File

@@ -1278,8 +1278,7 @@ SBError SBDebugger::SetInternalVariable(const char *var_name, const char *value,
ConstString(debugger_instance_name)));
Status error;
if (debugger_sp) {
ExecutionContext exe_ctx(
debugger_sp->GetCommandInterpreter().GetExecutionContext());
ExecutionContext exe_ctx(debugger_sp->GetSelectedExecutionContext());
error = debugger_sp->SetPropertyValue(&exe_ctx, eVarSetOperationAssign,
var_name, value);
} else {
@@ -1303,8 +1302,7 @@ SBDebugger::GetInternalVariableValue(const char *var_name,
ConstString(debugger_instance_name)));
Status error;
if (debugger_sp) {
ExecutionContext exe_ctx(
debugger_sp->GetCommandInterpreter().GetExecutionContext());
ExecutionContext exe_ctx(debugger_sp->GetSelectedExecutionContext());
lldb::OptionValueSP value_sp(
debugger_sp->GetPropertyValue(&exe_ctx, var_name, false, error));
if (value_sp) {

32
lldb/test/API/python_api/debugger/TestDebuggerAPI.py
View File

@@ -43,3 +43,35 @@ class DebuggerAPITestCase(TestBase):
target = lldb.SBTarget()
self.assertFalse(target.IsValid())
self.dbg.DeleteTarget(target)
@add_test_categories(['pyapi'])
def test_debugger_internal_variables(self):
debugger_name = self.dbg.GetInstanceName()
# Set a variable and check it was written successfully.
error = lldb.SBDebugger.SetInternalVariable(
'target.prefer-dynamic-value', 'no-dynamic-values', debugger_name)
self.assertTrue(error.Success())
ret = lldb.SBDebugger.GetInternalVariableValue(
'target.prefer-dynamic-value', debugger_name)
self.assertEqual(ret.GetSize(), 1)
self.assertEqual(ret.GetStringAtIndex(0), 'no-dynamic-values')
# Set a variable with a different value.
error = lldb.SBDebugger.SetInternalVariable(
'target.prefer-dynamic-value', 'no-run-target', debugger_name)
self.assertTrue(error.Success())
ret = lldb.SBDebugger.GetInternalVariableValue(
'target.prefer-dynamic-value', debugger_name)
self.assertEqual(ret.GetSize(), 1)
self.assertEqual(ret.GetStringAtIndex(0), 'no-run-target')
# Try setting invalid value, check for error.
error = lldb.SBDebugger.SetInternalVariable(
'target.prefer-dynamic-value', 'dummy-value', debugger_name)
self.assertTrue(error.Fail())
# Check that the value didn't change.
ret = lldb.SBDebugger.GetInternalVariableValue(
'target.prefer-dynamic-value', debugger_name)
self.assertEqual(ret.GetSize(), 1)
self.assertEqual(ret.GetStringAtIndex(0), 'no-run-target')