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.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@119784 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Target/Thread.cpp b/source/Target/Thread.cpp
index 789f3a0..0db16fe 100644
--- a/source/Target/Thread.cpp
+++ b/source/Target/Thread.cpp
@@ -42,7 +42,7 @@
Thread::Thread (Process &process, lldb::tid_t tid) :
UserID (tid),
- ThreadInstanceSettings (*(Thread::GetSettingsController().get())),
+ ThreadInstanceSettings (*GetSettingsController()),
m_process (process),
m_actual_stop_info_sp (),
m_index_id (process.GetNextThreadIndexID ()),
@@ -1032,8 +1032,9 @@
lldb::InstanceSettingsSP
Thread::SettingsController::CreateInstanceSettings (const char *instance_name)
{
- ThreadInstanceSettings *new_settings = new ThreadInstanceSettings (*(Thread::GetSettingsController().get()),
- false, instance_name);
+ ThreadInstanceSettings *new_settings = new ThreadInstanceSettings (*GetSettingsController(),
+ false,
+ instance_name);
lldb::InstanceSettingsSP new_settings_sp (new_settings);
return new_settings_sp;
}
@@ -1068,7 +1069,7 @@
}
ThreadInstanceSettings::ThreadInstanceSettings (const ThreadInstanceSettings &rhs) :
- InstanceSettings (*(Thread::GetSettingsController().get()), CreateInstanceName().AsCString()),
+ InstanceSettings (*Thread::GetSettingsController(), CreateInstanceName().AsCString()),
m_avoid_regexp_ap (),
m_trace_enabled (rhs.m_trace_enabled)
{