commit 9b32ee1611d7501da1db80a7155bee08f6943b40
author Ken Dyck <kd@kendyck.com> Thu Mar 31 00:37:24 2011 +0000
committer Ken Dyck <kd@kendyck.com> Thu Mar 31 00:37:24 2011 +0000
tree 5c1f6d46786e52993d4462d78e6686e999ff1323
parent b1798f7b01e6e37254edbe1d649295b3231984f4

Convert the RealBaseOffset parameter of
VCallAndVBaseOffsetBuilder::AddVCallAndVBaseOffsets() to
CharUnits. No change in functionality intended.

llvm-svn: 128596

clang/lib/CodeGen/CGVTables.cpp

diff --git a/clang/lib/CodeGen/CGVTables.cpp b/clang/lib/CodeGen/CGVTables.cpp
index 78399f0..80fff76 100644
--- a/clang/lib/CodeGen/CGVTables.cpp
+++ b/clang/lib/CodeGen/CGVTables.cpp
@@ -743,7 +743,7 @@
   /// AddVCallAndVBaseOffsets - Add vcall offsets and vbase offsets for the
   /// given base subobject.
   void AddVCallAndVBaseOffsets(BaseSubobject Base, bool BaseIsVirtual,
-                               uint64_t RealBaseOffset);
+                               CharUnits RealBaseOffset);
   
   /// AddVCallOffsets - Add vcall offsets for the given base subobject.
   void AddVCallOffsets(BaseSubobject Base, CharUnits VBaseOffset);
@@ -765,7 +765,8 @@
     Context(MostDerivedClass->getASTContext()), Overriders(Overriders) {
       
     // Add vcall and vbase offsets.
-    AddVCallAndVBaseOffsets(Base, BaseIsVirtual, OffsetInLayoutClass);
+    AddVCallAndVBaseOffsets(Base, BaseIsVirtual, 
+                            Context.toCharUnitsFromBits(OffsetInLayoutClass));
   }
   
   /// Methods for iterating over the components.
@@ -782,7 +783,7 @@
 void 
 VCallAndVBaseOffsetBuilder::AddVCallAndVBaseOffsets(BaseSubobject Base,
                                                     bool BaseIsVirtual,
-                                                    uint64_t RealBaseOffset) {
+                                                    CharUnits RealBaseOffset) {
   const ASTRecordLayout &Layout = Context.getASTRecordLayout(Base.getBase());
   
   // Itanium C++ ABI 2.5.2:
@@ -821,11 +822,11 @@
       PrimaryBaseIsVirtual, RealBaseOffset);
   }
 
-  AddVBaseOffsets(Base.getBase(), RealBaseOffset);
+  AddVBaseOffsets(Base.getBase(), Context.toBits(RealBaseOffset));
 
   // We only want to add vcall offsets for virtual bases.
   if (BaseIsVirtual)
-    AddVCallOffsets(Base, Context.toCharUnitsFromBits(RealBaseOffset));
+    AddVCallOffsets(Base, RealBaseOffset);
 }
 
 int64_t VCallAndVBaseOffsetBuilder::getCurrentOffsetOffset() const {