From: Zachary Turner <zturner@google.com>
Date: Wed, 12 Apr 2017 23:27:43 +0000 (+0000)
Subject: Fix initialization order of class members.
X-Git-Tag: android-x86-7.1-r4~17790
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=71cd6a6292c3507fcc31badab675a14a87e913d5;p=android-x86%2Fexternal-llvm.git

Fix initialization order of class members.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@300137 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/DebugInfo/PDB/UDTLayout.h b/include/llvm/DebugInfo/PDB/UDTLayout.h
index f7fdb7cdad3..fca2d43bb3e 100644
--- a/include/llvm/DebugInfo/PDB/UDTLayout.h
+++ b/include/llvm/DebugInfo/PDB/UDTLayout.h
@@ -112,10 +112,10 @@ protected:
 
   void addChildToLayout(std::unique_ptr<StorageItemBase> Child);
 
-  uint32_t SizeOf = 0;
+  const PDBSymbol &SymbolBase;
   std::string Name;
+  uint32_t SizeOf = 0;
 
-  const PDBSymbol &SymbolBase;
   BitVector UsedBytes;
   std::vector<std::unique_ptr<PDBSymbol>> NonStorageItems;
   std::vector<std::unique_ptr<StorageItemBase>> ChildStorage;
diff --git a/lib/DebugInfo/PDB/UDTLayout.cpp b/lib/DebugInfo/PDB/UDTLayout.cpp
index 525913c1865..5751e020cb7 100644
--- a/lib/DebugInfo/PDB/UDTLayout.cpp
+++ b/lib/DebugInfo/PDB/UDTLayout.cpp
@@ -42,8 +42,8 @@ StorageItemBase::StorageItemBase(const UDTLayoutBase &Parent,
                                  const PDBSymbol &Symbol,
                                  const std::string &Name,
                                  uint32_t OffsetInParent, uint32_t Size)
-    : Parent(Parent), Symbol(Symbol), Name(Name), SizeOf(Size),
-      OffsetInParent(OffsetInParent) {
+    : Parent(Parent), Symbol(Symbol), Name(Name),
+      OffsetInParent(OffsetInParent), SizeOf(Size) {
   UsedBytes.resize(SizeOf, true);
 }