diff options
author | Ken Dyck <kd@kendyck.com> | 2011-04-02 17:52:22 +0000 |
---|---|---|
committer | Ken Dyck <kd@kendyck.com> | 2011-04-02 17:52:22 +0000 |
commit | 4fbabd37fd107e0e477b45146499d38a77bf9335 (patch) | |
tree | 312fb5e65fb9feb883a8546284b0ac36bcbe3f15 /lib/CodeGen/CGDebugInfo.cpp | |
parent | d22153218848a8c7c4d81758aec09da39fef29ae (diff) |
Change the return type of CodeGenVTables::getVirtualBaseOffsetOffset() to
CharUnits. No change in functionality intended.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@128776 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGDebugInfo.cpp')
-rw-r--r-- | lib/CodeGen/CGDebugInfo.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp index c7a50efcd8..24df2edbac 100644 --- a/lib/CodeGen/CGDebugInfo.cpp +++ b/lib/CodeGen/CGDebugInfo.cpp @@ -808,7 +808,7 @@ CollectCXXBases(const CXXRecordDecl *RD, llvm::DIFile Unit, for (CXXRecordDecl::base_class_const_iterator BI = RD->bases_begin(), BE = RD->bases_end(); BI != BE; ++BI) { unsigned BFlags = 0; - uint64_t BaseOffset; + CharUnits BaseOffset; const CXXRecordDecl *Base = cast<CXXRecordDecl>(BI->getType()->getAs<RecordType>()->getDecl()); @@ -816,10 +816,11 @@ CollectCXXBases(const CXXRecordDecl *RD, llvm::DIFile Unit, if (BI->isVirtual()) { // virtual base offset offset is -ve. The code generator emits dwarf // expression where it expects +ve number. - BaseOffset = 0 - CGM.getVTables().getVirtualBaseOffsetOffset(RD, Base); + BaseOffset = CharUnits::Zero() - + CGM.getVTables().getVirtualBaseOffsetOffset(RD, Base); BFlags = llvm::DIDescriptor::FlagVirtual; } else - BaseOffset = RL.getBaseClassOffsetInBits(Base); + BaseOffset = RL.getBaseClassOffset(Base); AccessSpecifier Access = BI->getAccessSpecifier(); if (Access == clang::AS_private) @@ -830,7 +831,7 @@ CollectCXXBases(const CXXRecordDecl *RD, llvm::DIFile Unit, llvm::DIType DTy = DBuilder.createInheritance(RecordTy, getOrCreateType(BI->getType(), Unit), - BaseOffset, BFlags); + BaseOffset.getQuantity(), BFlags); EltTys.push_back(DTy); } } |