diff options
| author | Ken Dyck <kd@kendyck.com> | 2011-03-30 01:14:22 +0000 |
|---|---|---|
| committer | Ken Dyck <kd@kendyck.com> | 2011-03-30 01:14:22 +0000 |
| commit | 078f3e690540903575fd51ad843b6c0e6f81cc82 (patch) | |
| tree | e5f6cb09f325dbe6a2a6b1af14f394abac3fa10b /clang/lib/CodeGen/CGVTables.cpp | |
| parent | 032a903982970115150aef497b4e7034efe54d8e (diff) | |
| download | llvm-078f3e690540903575fd51ad843b6c0e6f81cc82.zip llvm-078f3e690540903575fd51ad843b6c0e6f81cc82.tar.gz llvm-078f3e690540903575fd51ad843b6c0e6f81cc82.tar.bz2 | |
Convert a local offset variable to CharUnits. No change in functionality
intended.
llvm-svn: 128521
Diffstat (limited to 'clang/lib/CodeGen/CGVTables.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGVTables.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/CGVTables.cpp b/clang/lib/CodeGen/CGVTables.cpp index b42c9fb..ac27ab8 100644 --- a/clang/lib/CodeGen/CGVTables.cpp +++ b/clang/lib/CodeGen/CGVTables.cpp @@ -1954,8 +1954,8 @@ VTableBuilder::LayoutVTablesForVirtualBases(const CXXRecordDecl *RD, !PrimaryVirtualBases.count(BaseDecl) && VBases.insert(BaseDecl)) { const ASTRecordLayout &MostDerivedClassLayout = Context.getASTRecordLayout(MostDerivedClass); - uint64_t BaseOffset = - MostDerivedClassLayout.getVBaseClassOffsetInBits(BaseDecl); + CharUnits BaseOffset = + MostDerivedClassLayout.getVBaseClassOffset(BaseDecl); const ASTRecordLayout &LayoutClassLayout = Context.getASTRecordLayout(LayoutClass); @@ -1963,7 +1963,7 @@ VTableBuilder::LayoutVTablesForVirtualBases(const CXXRecordDecl *RD, LayoutClassLayout.getVBaseClassOffset(BaseDecl); LayoutPrimaryAndSecondaryVTables( - BaseSubobject(BaseDecl, Context.toCharUnitsFromBits(BaseOffset)), + BaseSubobject(BaseDecl, BaseOffset), /*BaseIsMorallyVirtual=*/true, /*BaseIsVirtualInLayoutClass=*/true, BaseOffsetInLayoutClass); |