From: Ken Dyck <kd@kendyck.com>
Date: Wed, 30 Mar 2011 10:11:40 +0000 (+0000)
Subject: Convert the offset parameter of
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=301af86e8d1a309a625230d9c80bbf3e78a50fc6;p=clang

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


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@128531 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/CGVTables.cpp b/lib/CodeGen/CGVTables.cpp
index a0d7c4cfc9..08d2467534 100644
--- a/lib/CodeGen/CGVTables.cpp
+++ b/lib/CodeGen/CGVTables.cpp
@@ -746,7 +746,7 @@ private:
                                uint64_t RealBaseOffset);
   
   /// AddVCallOffsets - Add vcall offsets for the given base subobject.
-  void AddVCallOffsets(BaseSubobject Base, uint64_t VBaseOffset);
+  void AddVCallOffsets(BaseSubobject Base, CharUnits VBaseOffset);
   
   /// AddVBaseOffsets - Add vbase offsets for the given class.
   void AddVBaseOffsets(const CXXRecordDecl *Base, uint64_t OffsetInLayoutClass);
@@ -825,7 +825,7 @@ VCallAndVBaseOffsetBuilder::AddVCallAndVBaseOffsets(BaseSubobject Base,
 
   // We only want to add vcall offsets for virtual bases.
   if (BaseIsVirtual)
-    AddVCallOffsets(Base, RealBaseOffset);
+    AddVCallOffsets(Base, Context.toCharUnitsFromBits(RealBaseOffset));
 }
 
 int64_t VCallAndVBaseOffsetBuilder::getCurrentOffsetOffset() const {
@@ -843,7 +843,7 @@ int64_t VCallAndVBaseOffsetBuilder::getCurrentOffsetOffset() const {
 }
 
 void VCallAndVBaseOffsetBuilder::AddVCallOffsets(BaseSubobject Base, 
-                                                 uint64_t VBaseOffset) {
+                                                 CharUnits VBaseOffset) {
   const CXXRecordDecl *RD = Base.getBase();
   const ASTRecordLayout &Layout = Context.getASTRecordLayout(RD);
 
@@ -885,7 +885,7 @@ void VCallAndVBaseOffsetBuilder::AddVCallOffsets(BaseSubobject Base,
       
       /// The vcall offset is the offset from the virtual base to the object 
       /// where the function was overridden.
-      Offset = Overrider.Offset - Context.toCharUnitsFromBits(VBaseOffset);
+      Offset = Overrider.Offset - VBaseOffset;
     }
     
     Components.push_back(