[Lldb-commits] [lldb] r108524 - in /lldb/trunk/source/Target: Thread.cpp ThreadPlan.cpp ThreadPlanCallFunction.cpp ThreadPlanStepInstruction.cpp ThreadPlanStepOut.cpp

[Benjamin Kramer]

Author: d0k
Date: Fri Jul 16 07:32:33 2010
New Revision: 108524

URL: http://llvm.org/viewvc/llvm-project?rev=108524&view=rev
Log:
Fix constructor initialization order. Patch by Bill Lynch.

Modified:
    lldb/trunk/source/Target/Thread.cpp
    lldb/trunk/source/Target/ThreadPlan.cpp
    lldb/trunk/source/Target/ThreadPlanCallFunction.cpp
    lldb/trunk/source/Target/ThreadPlanStepInstruction.cpp
    lldb/trunk/source/Target/ThreadPlanStepOut.cpp

Modified: lldb/trunk/source/Target/Thread.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Thread.cpp?rev=108524&r1=108523&r2=108524&view=diff
==============================================================================
--- lldb/trunk/source/Target/Thread.cpp (original)
+++ lldb/trunk/source/Target/Thread.cpp Fri Jul 16 07:32:33 2010
@@ -36,9 +36,9 @@
 
 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::StopInfo::StopInfo(Thread *thread) :
     m_reason (eStopReasonInvalid),
-    m_description (),
     m_thread (thread),
+    m_description (),
     m_details ()
 {
     m_description[0] = '\0';

Modified: lldb/trunk/source/Target/ThreadPlan.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/ThreadPlan.cpp?rev=108524&r1=108523&r2=108524&view=diff
==============================================================================
--- lldb/trunk/source/Target/ThreadPlan.cpp (original)
+++ lldb/trunk/source/Target/ThreadPlan.cpp Fri Jul 16 07:32:33 2010
@@ -24,14 +24,14 @@
 // 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());

Modified: lldb/trunk/source/Target/ThreadPlanCallFunction.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/ThreadPlanCallFunction.cpp?rev=108524&r1=108523&r2=108524&view=diff
==============================================================================
--- lldb/trunk/source/Target/ThreadPlanCallFunction.cpp (original)
+++ lldb/trunk/source/Target/ThreadPlanCallFunction.cpp Fri Jul 16 07:32:33 2010
@@ -36,12 +36,12 @@
                                                 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 @@
                                                 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);

Modified: lldb/trunk/source/Target/ThreadPlanStepInstruction.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/ThreadPlanStepInstruction.cpp?rev=108524&r1=108523&r2=108524&view=diff
==============================================================================
--- lldb/trunk/source/Target/ThreadPlanStepInstruction.cpp (original)
+++ lldb/trunk/source/Target/ThreadPlanStepInstruction.cpp Fri Jul 16 07:32:33 2010
@@ -39,9 +39,10 @@
 ) :
     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();
 }

Modified: lldb/trunk/source/Target/ThreadPlanStepOut.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/ThreadPlanStepOut.cpp?rev=108524&r1=108523&r2=108524&view=diff
==============================================================================
--- lldb/trunk/source/Target/ThreadPlanStepOut.cpp (original)
+++ lldb/trunk/source/Target/ThreadPlanStepOut.cpp Fri Jul 16 07:32:33 2010
@@ -39,9 +39,9 @@
     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);