]> granicus.if.org Git - clang/commitdiff
Cleanup.
authorAnders Carlsson <andersca@mac.com>
Sun, 9 May 2010 05:03:38 +0000 (05:03 +0000)
committerAnders Carlsson <andersca@mac.com>
Sun, 9 May 2010 05:03:38 +0000 (05:03 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@103370 91177308-0d34-0410-b5e6-96231b3b80d8

lib/AST/RecordLayoutBuilder.cpp

index 2d4b769735549819f43dbc1e8890d8ae981c615a..444c52b9426e9d5bff09f07b0fbefd392e302675 100644 (file)
@@ -423,7 +423,7 @@ bool ASTRecordLayoutBuilder::canPlaceRecordAtOffset(const CXXRecordDecl *RD,
       return false;
   }
 
-  const ASTRecordLayout &Info = Context.getASTRecordLayout(RD);
+  const ASTRecordLayout &Layout = Context.getASTRecordLayout(RD);
 
   // Check bases.
   for (CXXRecordDecl::base_class_const_iterator I = RD->bases_begin(),
@@ -433,12 +433,12 @@ bool ASTRecordLayoutBuilder::canPlaceRecordAtOffset(const CXXRecordDecl *RD,
     if (I->isVirtual())
       continue;
 
-    const CXXRecordDecl *Base =
+    const CXXRecordDecl *BaseDecl =
       cast<CXXRecordDecl>(I->getType()->getAs<RecordType>()->getDecl());
 
-    uint64_t BaseClassOffset = Info.getBaseClassOffset(Base);
+    uint64_t BaseOffset = Layout.getBaseClassOffset(BaseDecl);
 
-    if (!canPlaceRecordAtOffset(Base, Offset + BaseClassOffset))
+    if (!canPlaceRecordAtOffset(BaseDecl, Offset + BaseOffset))
       return false;
   }
 
@@ -448,7 +448,7 @@ bool ASTRecordLayoutBuilder::canPlaceRecordAtOffset(const CXXRecordDecl *RD,
        I != E; ++I, ++FieldNo) {
     const FieldDecl *FD = *I;
 
-    uint64_t FieldOffset = Info.getFieldOffset(FieldNo);
+    uint64_t FieldOffset = Layout.getFieldOffset(FieldNo);
 
     if (!canPlaceFieldAtOffset(FD, Offset + FieldOffset))
       return false;