2 files changed, 8 insertions, 7 deletions
diff --git a/clang/lib/CodeGen/CGRecordLayout.h b/clang/lib/CodeGen/CGRecordLayout.h
index dd10024dd45..ffdbc292d30 100644
--- a/clang/lib/CodeGen/CGRecordLayout.h
+++ b/clang/lib/CodeGen/CGRecordLayout.h
@@ -177,7 +177,7 @@ private:
 
   /// The LLVM type for the non-virtual part of this record layout, used for
   /// laying out the record as a base.
-  const llvm::Type *BaseLLVMType;
+  const llvm::Type *NonVirtualBaseLLVMType;
 
   /// Map from (non-bit-field) struct field to the corresponding llvm struct
   /// type field no. This info is populated by record builder.
@@ -196,9 +196,10 @@ private:
   bool IsZeroInitializable : 1;
 
 public:
-  CGRecordLayout(const llvm::Type *LLVMType, const llvm::Type *BaseLLVMType,
+  CGRecordLayout(const llvm::Type *LLVMType,
+                 const llvm::Type *NonVirtualBaseLLVMType,
                  bool IsZeroInitializable)
-    : LLVMType(LLVMType), BaseLLVMType(BaseLLVMType), 
+    : LLVMType(LLVMType), NonVirtualBaseLLVMType(NonVirtualBaseLLVMType), 
     IsZeroInitializable(IsZeroInitializable) {}
 
   /// \brief Return the LLVM type associated with this record.
@@ -206,8 +207,8 @@ public:
     return LLVMType;
   }
 
-  const llvm::Type *getBaseLLVMType() const {
-      return BaseLLVMType;
+  const llvm::Type *getNonVirtualBaseLLVMType() const {
+      return NonVirtualBaseLLVMType;
   }
 
   /// \brief Check whether this struct can be C++ zero-initialized
diff --git a/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp b/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp
index 001c3445102..0d9c6d49642 100644
--- a/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp
+++ b/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp
@@ -832,8 +832,8 @@ CGRecordLayout *CodeGenTypes::ComputeRecordLayout(const RecordDecl *D) {
 void CGRecordLayout::print(llvm::raw_ostream &OS) const {
   OS << "<CGRecordLayout\n";
   OS << "  LLVMType:" << *LLVMType << "\n";
-  if (BaseLLVMType)
-    OS << "  BaseLLVMType:" << *BaseLLVMType << "\n"; 
+  if (NonVirtualBaseLLVMType)
+    OS << "  NonVirtualBaseLLVMType:" << *NonVirtualBaseLLVMType << "\n"; 
   OS << "  IsZeroInitializable:" << IsZeroInitializable << "\n";
   OS << "  BitFields:[\n";