Make all debugger-level user settable variables into instance variables.
Make get/set variable at the debugger level always set the particular debugger's instance variables rather than
the default variables.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@113474 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/API/SBDebugger.cpp b/source/API/SBDebugger.cpp
index d83c65c..1635cfa 100644
--- a/source/API/SBDebugger.cpp
+++ b/source/API/SBDebugger.cpp
@@ -569,8 +569,16 @@
SBDebugger::SetInternalVariable (const char *var_name, const char *value)
{
lldb::UserSettingsControllerSP root_settings_controller = lldb_private::Debugger::GetSettingsController();
+
+ const char *debugger_instance_name;
- Error err = root_settings_controller->SetVariable (var_name, value, lldb::eVarSetOperationAssign, false);
+ if (m_opaque_sp)
+ debugger_instance_name = m_opaque_sp->GetInstanceName().AsCString();
+ else
+ debugger_instance_name = "";
+
+ Error err = root_settings_controller->SetVariable (var_name, value, lldb::eVarSetOperationAssign, false,
+ debugger_instance_name);
SBError sb_error;
sb_error.SetError (err);
@@ -581,10 +589,17 @@
SBDebugger::GetInternalVariableValue (const char *var_name)
{
SBStringList ret_value;
+ lldb::SettableVariableType var_type;
+ const char *debugger_instance_name;
+
lldb::UserSettingsControllerSP root_settings_controller = lldb_private::Debugger::GetSettingsController();
- lldb::SettableVariableType var_type;
- StringList value = root_settings_controller->GetVariable (var_name, var_type);
+ if (m_opaque_sp)
+ debugger_instance_name = m_opaque_sp->GetInstanceName().AsCString();
+ else
+ debugger_instance_name = "";
+
+ StringList value = root_settings_controller->GetVariable (var_name, var_type, debugger_instance_name);
for (unsigned i = 0; i != value.GetSize(); ++i)
ret_value.AppendString (value.GetStringAtIndex(i));