warnings: Fix a bunch of -Wreorder problems.

llvm-svn: 143381

11 files changed, 23 insertions, 23 deletions

diff --git a/lldb/include/lldb/Expression/ClangASTSource.h b/lldb/include/lldb/Expression/ClangASTSource.h
index acf55b6fdb9..1406e7b5736 100644
--- a/lldb/include/lldb/Expression/ClangASTSource.h
+++ b/lldb/include/lldb/Expression/ClangASTSource.h
@@ -44,11 +44,11 @@ public:
     ///     A reference to the LLDB object that handles entity lookup.
     //------------------------------------------------------------------
 	ClangASTSource (const lldb::TargetSP &target) :
-        m_ast_context (NULL),
-        m_active_lookups (),
         m_import_in_progress (false),
         m_lookups_enabled (false),
-        m_target (target)
+        m_target (target),
+        m_ast_context (NULL),
+        m_active_lookups ()
     {
     }
     
diff --git a/lldb/include/lldb/Expression/ClangExpressionDeclMap.h b/lldb/include/lldb/Expression/ClangExpressionDeclMap.h
index d2147a2459d..c11abc392f9 100644
--- a/lldb/include/lldb/Expression/ClangExpressionDeclMap.h
+++ b/lldb/include/lldb/Expression/ClangExpressionDeclMap.h
@@ -665,11 +665,11 @@ private:
     {
     public:
         ParserVars(ClangExpressionDeclMap &decl_map) :
-            m_decl_map(decl_map),
             m_exe_ctx(NULL),
             m_sym_ctx(),
             m_persistent_vars(NULL),
-            m_enable_lookups(false)
+            m_enable_lookups(false),
+            m_decl_map(decl_map)
         {
         }
         
diff --git a/lldb/source/Commands/CommandObjectTarget.cpp b/lldb/source/Commands/CommandObjectTarget.cpp
index 09bb205f962..8b1e12bd8ad 100644
--- a/lldb/source/Commands/CommandObjectTarget.cpp
+++ b/lldb/source/Commands/CommandObjectTarget.cpp
@@ -2618,8 +2618,8 @@ public:
         
         CommandOptions (CommandInterpreter &interpreter) :
             Options(interpreter),
-            m_use_global_module_list (false),
             m_format_array(),
+            m_use_global_module_list (false),
             m_module_addr (LLDB_INVALID_ADDRESS)
         {
         }
diff --git a/lldb/source/Core/RegularExpression.cpp b/lldb/source/Core/RegularExpression.cpp
index c3953aae068..8099cd16899 100644
--- a/lldb/source/Core/RegularExpression.cpp
+++ b/lldb/source/Core/RegularExpression.cpp
@@ -32,8 +32,8 @@ RegularExpression::RegularExpression() :
 RegularExpression::RegularExpression(const char* re, int flags) :
     m_re(),
     m_comp_err (1),
-    m_compile_flags(flags),
-    m_preg()
+    m_preg(),
+    m_compile_flags(flags)
 {
     memset(&m_preg,0,sizeof(m_preg));
     Compile(re);
@@ -46,8 +46,8 @@ RegularExpression::RegularExpression(const char* re, int flags) :
 RegularExpression::RegularExpression(const char* re) :
     m_re(),
     m_comp_err (1),
-    m_compile_flags(REG_EXTENDED),
-    m_preg()
+    m_preg(),
+    m_compile_flags(REG_EXTENDED)
 {
     memset(&m_preg,0,sizeof(m_preg));
     Compile(re);
diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp
index c6924c36f68..3d48bd508ed 100644
--- a/lldb/source/Core/ValueObject.cpp
+++ b/lldb/source/Core/ValueObject.cpp
@@ -85,6 +85,7 @@ ValueObject::ValueObject (ValueObject &parent) :
     m_last_value_format(),
     m_last_synthetic_filter(),
     m_user_id_of_forced_summary(),
+    m_address_type_of_ptr_or_ref_children(eAddressTypeInvalid),
     m_value_is_valid (false),
     m_value_did_change (false),
     m_children_count_valid (false),
@@ -94,7 +95,6 @@ ValueObject::ValueObject (ValueObject &parent) :
     m_is_bitfield_for_scalar(false),
     m_is_expression_path_child(false),
     m_is_child_at_offset(false),
-    m_address_type_of_ptr_or_ref_children(eAddressTypeInvalid),
     m_trying_summary_already(false)
 {
     m_manager->ManageObject(this);
@@ -131,6 +131,7 @@ ValueObject::ValueObject (ExecutionContextScope *exe_scope,
     m_last_value_format(),
     m_last_synthetic_filter(),
     m_user_id_of_forced_summary(),
+    m_address_type_of_ptr_or_ref_children(child_ptr_or_ref_addr_type),
     m_value_is_valid (false),
     m_value_did_change (false),
     m_children_count_valid (false),
@@ -140,7 +141,6 @@ ValueObject::ValueObject (ExecutionContextScope *exe_scope,
     m_is_bitfield_for_scalar(false),
     m_is_expression_path_child(false),
     m_is_child_at_offset(false),
-    m_address_type_of_ptr_or_ref_children(child_ptr_or_ref_addr_type),
     m_trying_summary_already(false)
 {
     m_manager = new ValueObjectManager();
diff --git a/lldb/source/Expression/ASTResultSynthesizer.cpp b/lldb/source/Expression/ASTResultSynthesizer.cpp
index e78f09d92d3..cb832fa5a53 100644
--- a/lldb/source/Expression/ASTResultSynthesizer.cpp
+++ b/lldb/source/Expression/ASTResultSynthesizer.cpp
@@ -34,10 +34,10 @@ ASTResultSynthesizer::ASTResultSynthesizer(ASTConsumer *passthrough,
     m_ast_context (NULL),
     m_passthrough (passthrough),
     m_passthrough_sema (NULL),
-    m_sema (NULL),
-    m_desired_type (desired_type),
     m_scratch_ast_context (scratch_ast_context),
-    m_persistent_vars (persistent_vars)
+    m_persistent_vars (persistent_vars),
+    m_sema (NULL),
+    m_desired_type (desired_type)
 {
     if (!m_passthrough)
         return;
diff --git a/lldb/source/Expression/ClangUserExpression.cpp b/lldb/source/Expression/ClangUserExpression.cpp
index 7521bcbab61..8261099c9ef 100644
--- a/lldb/source/Expression/ClangUserExpression.cpp
+++ b/lldb/source/Expression/ClangUserExpression.cpp
@@ -54,9 +54,9 @@ ClangUserExpression::ClangUserExpression (const char *expr,
     m_objectivec (false),
     m_needs_object_ptr (false),
     m_const_object (false),
+    m_target (NULL),
     m_evaluated_statically (false),
-    m_const_result (),
-    m_target (NULL)
+    m_const_result ()
 {
 }
 
diff --git a/lldb/source/Expression/IRInterpreter.cpp b/lldb/source/Expression/IRInterpreter.cpp
index 97130d1d39d..5bb59a6d35a 100644
--- a/lldb/source/Expression/IRInterpreter.cpp
+++ b/lldb/source/Expression/IRInterpreter.cpp
@@ -419,8 +419,8 @@ public:
     InterpreterStackFrame (TargetData &target_data,
                            Memory &memory,
                            lldb_private::ClangExpressionDeclMap &decl_map) :
-        m_target_data (target_data),
         m_memory (memory),
+        m_target_data (target_data),
         m_decl_map (decl_map)
     {
         m_byte_order = (target_data.isLittleEndian() ? lldb::eByteOrderLittle : lldb::eByteOrderBig);
diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
index 27b42316dab..4871c79f23d 100644
--- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
+++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
@@ -80,8 +80,8 @@ InstructionLLVM::InstructionLLVM (const Address &addr,
                                   llvm::Triple::ArchType arch_type) :
     Instruction (addr, addr_class),
     m_disassembler (disassembler),
-    m_arch_type (arch_type),
-    m_inst (NULL)
+    m_inst (NULL),
+    m_arch_type (arch_type)
 {
 }
 
diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
index 88b29e1630f..0dbad50a884 100644
--- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
+++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
@@ -94,9 +94,9 @@ DynamicLoaderDarwinKernel::DynamicLoaderDarwinKernel (Process* process) :
     m_kext_summary_header_ptr_addr (),
     m_kext_summary_header_addr (),
     m_kext_summary_header (),
-    m_break_id (LLDB_INVALID_BREAK_ID),
     m_kext_summaries(),
-    m_mutex(Mutex::eMutexTypeRecursive)
+    m_mutex(Mutex::eMutexTypeRecursive),
+    m_break_id (LLDB_INVALID_BREAK_ID)
 {
 }
 
diff --git a/lldb/tools/driver/Driver.cpp b/lldb/tools/driver/Driver.cpp
index 856c08b3707..1f5e485f2b8 100644
--- a/lldb/tools/driver/Driver.cpp
+++ b/lldb/tools/driver/Driver.cpp
@@ -378,10 +378,10 @@ Driver::OptionData::OptionData () :
     m_debug_mode (false),
     m_print_version (false),
     m_print_help (false),
-    m_use_external_editor(false),
     m_wait_for(false),
     m_process_name(),
     m_process_pid(LLDB_INVALID_PROCESS_ID),
+    m_use_external_editor(false),
     m_seen_options()
 {
 }