diff options
| author | Greg Clayton <gclayton@apple.com> | 2010-11-19 03:46:01 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2010-11-19 03:46:01 +0000 |
| commit | dbe54508988f5745f4b88c8c4b60b577301a6944 (patch) | |
| tree | b1b39b5a6694d0291a8fa1b9d233059298262918 /lldb/source/Target/Process.cpp | |
| parent | 1818edb53fb989baf4777ee49677792d9e202c58 (diff) | |
| download | bcm5719-llvm-dbe54508988f5745f4b88c8c4b60b577301a6944.tar.gz bcm5719-llvm-dbe54508988f5745f4b88c8c4b60b577301a6944.zip | |
Fixed an issue where the UserSettingsControllers were being created out of
order and this was causing the target, process and thread trees to not be
available.
llvm-svn: 119784
Diffstat (limited to 'lldb/source/Target/Process.cpp')
| -rw-r--r-- | lldb/source/Target/Process.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp index 0a758f6d5e2..e50ecf27ef0 100644 --- a/lldb/source/Target/Process.cpp +++ b/lldb/source/Target/Process.cpp @@ -70,7 +70,7 @@ Process::FindPlugin (Target &target, const char *plugin_name, Listener &listener Process::Process(Target &target, Listener &listener) : UserID (LLDB_INVALID_PROCESS_ID), Broadcaster ("lldb.process"), - ProcessInstanceSettings (*(Process::GetSettingsController().get())), + ProcessInstanceSettings (*GetSettingsController()), m_target (target), m_public_state (eStateUnloaded), m_private_state (eStateUnloaded), @@ -2272,7 +2272,7 @@ Process::UpdateInstanceName () StreamString sstr; sstr.Printf ("%s", module_sp->GetFileSpec().GetFilename().AsCString()); - Process::GetSettingsController()->RenameInstanceSettings (GetInstanceName().AsCString(), + GetSettingsController()->RenameInstanceSettings (GetInstanceName().AsCString(), sstr.GetData()); } } @@ -2295,8 +2295,9 @@ Process::SettingsController::~SettingsController () lldb::InstanceSettingsSP Process::SettingsController::CreateInstanceSettings (const char *instance_name) { - ProcessInstanceSettings *new_settings = new ProcessInstanceSettings (*(Process::GetSettingsController().get()), - false, instance_name); + ProcessInstanceSettings *new_settings = new ProcessInstanceSettings (*GetSettingsController(), + false, + instance_name); lldb::InstanceSettingsSP new_settings_sp (new_settings); return new_settings_sp; } @@ -2336,7 +2337,7 @@ ProcessInstanceSettings::ProcessInstanceSettings (UserSettingsController &owner, } ProcessInstanceSettings::ProcessInstanceSettings (const ProcessInstanceSettings &rhs) : - InstanceSettings (*(Process::GetSettingsController().get()), CreateInstanceName().AsCString()), + InstanceSettings (*Process::GetSettingsController(), CreateInstanceName().AsCString()), m_run_args (rhs.m_run_args), m_env_vars (rhs.m_env_vars), m_input_path (rhs.m_input_path), |
