5 files changed, 18 insertions, 17 deletions
diff --git a/lldb/source/Target/Thread.cpp b/lldb/source/Target/Thread.cpp
index 40ea4df14a5..fe9f7f55676 100644
--- a/lldb/source/Target/Thread.cpp
+++ b/lldb/source/Target/Thread.cpp
@@ -36,9 +36,9 @@ using namespace lldb_private;
 
 Thread::Thread (Process &process, lldb::tid_t tid) :
     UserID (tid),
+    m_process (process),
     m_index_id (process.GetNextThreadIndexID ()),
     m_reg_context_sp (),
-    m_process (process),
     m_state (eStateUnloaded),
     m_plan_stack (),
     m_immediate_plan_stack(),
@@ -90,8 +90,8 @@ Thread::SetResumeState (StateType state)
 
 Thread::StopInfo::StopInfo(Thread *thread) :
     m_reason (eStopReasonInvalid),
-    m_description (),
     m_thread (thread),
+    m_description (),
     m_details ()
 {
     m_description[0] = '\0';
diff --git a/lldb/source/Target/ThreadPlan.cpp b/lldb/source/Target/ThreadPlan.cpp
index 5447778a42e..6d3e99caf2b 100644
--- a/lldb/source/Target/ThreadPlan.cpp
+++ b/lldb/source/Target/ThreadPlan.cpp
@@ -24,14 +24,14 @@ using namespace lldb_private;
 // ThreadPlan constructor
 //----------------------------------------------------------------------
 ThreadPlan::ThreadPlan(ThreadPlanKind kind, const char *name, Thread &thread, Vote stop_vote, Vote run_vote) :
+    m_thread (thread),
+    m_stop_vote (stop_vote),
+    m_run_vote (run_vote),
     m_kind (kind),
     m_name (name),
-    m_thread (thread),
-    m_plan_complete(false),
     m_plan_complete_mutex (Mutex::eMutexTypeRecursive),
+    m_plan_complete (false),
     m_plan_private (false),
-    m_stop_vote (stop_vote),
-    m_run_vote (run_vote),
     m_okay_to_discard (false)
 {
     SetID (GetNextID());
diff --git a/lldb/source/Target/ThreadPlanCallFunction.cpp b/lldb/source/Target/ThreadPlanCallFunction.cpp
index 0309505e4ae..55e9d25133c 100644
--- a/lldb/source/Target/ThreadPlanCallFunction.cpp
+++ b/lldb/source/Target/ThreadPlanCallFunction.cpp
@@ -36,12 +36,12 @@ ThreadPlanCallFunction::ThreadPlanCallFunction (Thread &thread,
                                                 bool stop_other_threads,
                                                 bool discard_on_error) :
     ThreadPlan (ThreadPlan::eKindCallFunction, "Call function plan", thread, eVoteNoOpinion, eVoteNoOpinion),
-    m_valid(false),
-    m_process(thread.GetProcess()),
+    m_valid (false),
+    m_stop_other_threads (stop_other_threads),
     m_arg_addr (arg),
     m_args (NULL),
-    m_thread(thread),
-    m_stop_other_threads(stop_other_threads)
+    m_process (thread.GetProcess()),
+    m_thread (thread)
 {
 
     SetOkayToDiscard (discard_on_error);
@@ -90,12 +90,12 @@ ThreadPlanCallFunction::ThreadPlanCallFunction (Thread &thread,
                                                 bool stop_other_threads,
                                                 bool discard_on_error) :
     ThreadPlan (ThreadPlan::eKindCallFunction, "Call function plan", thread, eVoteNoOpinion, eVoteNoOpinion),
-    m_valid(false),
-    m_process(thread.GetProcess()),
+    m_valid (false),
+    m_stop_other_threads (stop_other_threads),
     m_arg_addr (0),
     m_args (&args),
-    m_thread(thread),
-    m_stop_other_threads(stop_other_threads)
+    m_process (thread.GetProcess()),
+    m_thread (thread)
 {
     
     SetOkayToDiscard (discard_on_error);
diff --git a/lldb/source/Target/ThreadPlanStepInstruction.cpp b/lldb/source/Target/ThreadPlanStepInstruction.cpp
index 644c768eaa7..a59d928624c 100644
--- a/lldb/source/Target/ThreadPlanStepInstruction.cpp
+++ b/lldb/source/Target/ThreadPlanStepInstruction.cpp
@@ -39,9 +39,10 @@ ThreadPlanStepInstruction::ThreadPlanStepInstruction
 ) :
     ThreadPlan (ThreadPlan::eKindStepInstruction, "Step over single instruction", thread, stop_vote, run_vote),
     m_instruction_addr (0),
+    m_stop_other_threads (stop_other_threads),
     m_step_over (step_over),
-    m_stack_depth(0),
-    m_stop_other_threads (stop_other_threads){
+    m_stack_depth (0)
+{
     m_instruction_addr = m_thread.GetRegisterContext()->GetPC(0);
     m_stack_depth = m_thread.GetStackFrameCount();
 }
diff --git a/lldb/source/Target/ThreadPlanStepOut.cpp b/lldb/source/Target/ThreadPlanStepOut.cpp
index f72dca5e091..10576b017e5 100644
--- a/lldb/source/Target/ThreadPlanStepOut.cpp
+++ b/lldb/source/Target/ThreadPlanStepOut.cpp
@@ -39,9 +39,9 @@ ThreadPlanStepOut::ThreadPlanStepOut
     ThreadPlan (ThreadPlan::eKindStepOut, "Step out", thread, stop_vote, run_vote),
     m_step_from_context (context),
     m_step_from_insn (LLDB_INVALID_ADDRESS),
+    m_return_bp_id (LLDB_INVALID_BREAK_ID),
     m_return_addr (LLDB_INVALID_ADDRESS),
     m_first_insn (first_insn),
-    m_return_bp_id(LLDB_INVALID_BREAK_ID),
     m_stop_others (stop_others)
 {
     m_step_from_insn = m_thread.GetRegisterContext()->GetPC(0);