commit 89d521d6acf4abb56c5582da0689f147ee82b3eb
author Andy Yankovsky <werat@google.com> Mon Feb 01 12:25:53 2021 +0100
committer Copybara-Service <copybara-worker@google.com> Fri Feb 05 01:31:28 2021 -0800
tree 6a5a5bee36511676f4788ebad32bc167675ec1a6
parent 0e0c7d1fdf6c66f7121b2fbddc998d3f222d1fcb

[lldb] Use current execution context in SBDebugger

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

GitOrigin-RevId: 754ab803b8dc659e3645d369d1b5d6d2f97be29e

source/API/SBDebugger.cpp

diff --git a/source/API/SBDebugger.cpp b/source/API/SBDebugger.cpp
index 6245b3a..e3d2e47 100644
--- a/source/API/SBDebugger.cpp
+++ b/source/API/SBDebugger.cpp
@@ -1278,8 +1278,7 @@
       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 @@
       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) {

test/API/python_api/debugger/TestDebuggerAPI.py

diff --git a/test/API/python_api/debugger/TestDebuggerAPI.py b/test/API/python_api/debugger/TestDebuggerAPI.py
index 32202ac..5d0311e 100644
--- a/test/API/python_api/debugger/TestDebuggerAPI.py
+++ b/test/API/python_api/debugger/TestDebuggerAPI.py
@@ -43,3 +43,35 @@
         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')