diff options
| author | Devang Patel <dpatel@apple.com> | 2011-04-04 20:36:06 +0000 |
|---|---|---|
| committer | Devang Patel <dpatel@apple.com> | 2011-04-04 20:36:06 +0000 |
| commit | 62c117db25cf7142e149fce82d2b3caa1237674c (patch) | |
| tree | 6cc1ea8f13a8dcdfb5083cd20b61fbe421955edb /lib/CodeGen/CGClass.cpp | |
| parent | f8adeefa9e9882bff402e092024dd457f8574673 (diff) | |
Revert r128770, r128771, r128773 and r128776 for now. It breaks debug info.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@128842 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGClass.cpp')
| -rw-r--r-- | lib/CodeGen/CGClass.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/CodeGen/CGClass.cpp b/lib/CodeGen/CGClass.cpp index ce41e84569..30f96efd79 100644 --- a/lib/CodeGen/CGClass.cpp +++ b/lib/CodeGen/CGClass.cpp @@ -1317,12 +1317,11 @@ CodeGenFunction::GetVirtualBaseClassOffset(llvm::Value *This, const CXXRecordDecl *ClassDecl, const CXXRecordDecl *BaseClassDecl) { llvm::Value *VTablePtr = GetVTablePtr(This, Int8PtrTy); - CharUnits VBaseOffsetOffset = + int64_t VBaseOffsetOffset = CGM.getVTables().getVirtualBaseOffsetOffset(ClassDecl, BaseClassDecl); llvm::Value *VBaseOffsetPtr = - Builder.CreateConstGEP1_64(VTablePtr, VBaseOffsetOffset.getQuantity(), - "vbase.offset.ptr"); + Builder.CreateConstGEP1_64(VTablePtr, VBaseOffsetOffset, "vbase.offset.ptr"); const llvm::Type *PtrDiffTy = ConvertType(getContext().getPointerDiffType()); |