r201914 - Fix two warnings introduced r201907

[Warren Hunt]

Author: whunt
Date: Fri Feb 21 18:22:15 2014
New Revision: 201914

URL: http://llvm.org/viewvc/llvm-project?rev=201914&view=rev
Log:
Fix two warnings introduced r201907

Unused variable is removed.  Construction order is changed to match 
declaration order.


Modified:
    cfe/trunk/lib/CodeGen/CGRecordLayoutBuilder.cpp

Modified: cfe/trunk/lib/CodeGen/CGRecordLayoutBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGRecordLayoutBuilder.cpp?rev=201914&r1=201913&r2=201914&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGRecordLayoutBuilder.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGRecordLayoutBuilder.cpp Fri Feb 21 18:22:15 2014
@@ -204,11 +204,11 @@ private:
 } // namespace {
 
 CGRecordLowering::CGRecordLowering(CodeGenTypes &Types, const RecordDecl *D)
-  : D(D), RD(dyn_cast<CXXRecordDecl>(D)),
+  : Types(Types), Context(Types.getContext()), D(D),
+    RD(dyn_cast<CXXRecordDecl>(D)),
     Layout(Types.getContext().getASTRecordLayout(D)),
-    IsZeroInitializable(true), IsZeroInitializableAsBase(true),
-    Packed(false), Types(Types), Context(Types.getContext()),
-    DataLayout(Types.getDataLayout()) {}
+    DataLayout(Types.getDataLayout()), IsZeroInitializable(true),
+    IsZeroInitializableAsBase(true), Packed(false) {}
 
 void CGRecordLowering::setBitFieldInfo(
     const FieldDecl *FD, CharUnits StartOffset, llvm::Type *StorageType) {
@@ -680,7 +680,6 @@ CGRecordLayout *CodeGenTypes::ComputeRec
 
   if (BaseTy) {
     CharUnits NonVirtualSize  = Layout.getNonVirtualSize();
-    CharUnits NonVirtualAlign = Layout.getNonVirtualAlignment();
 
     uint64_t AlignedNonVirtualTypeSizeInBits = 
       getContext().toBits(NonVirtualSize);