[cfe-commits] r103370 - /cfe/trunk/lib/AST/RecordLayoutBuilder.cpp

Anders Carlsson andersca at mac.com
Sat May 8 22:03:38 PDT 2010


Author: andersca
Date: Sun May  9 00:03:38 2010
New Revision: 103370

URL: http://llvm.org/viewvc/llvm-project?rev=103370&view=rev
Log:
Cleanup.

Modified:
    cfe/trunk/lib/AST/RecordLayoutBuilder.cpp

Modified: cfe/trunk/lib/AST/RecordLayoutBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/RecordLayoutBuilder.cpp?rev=103370&r1=103369&r2=103370&view=diff
==============================================================================
--- cfe/trunk/lib/AST/RecordLayoutBuilder.cpp (original)
+++ cfe/trunk/lib/AST/RecordLayoutBuilder.cpp Sun May  9 00:03:38 2010
@@ -423,7 +423,7 @@
       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 @@
     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 @@
        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;





More information about the cfe-commits mailing list