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 | 84852bbb42b5302682d70fc9969fa1c8e0ac84a4 (patch) | |
| tree | fb74e3305ba0c2c4b40489774fb8bf1ff7b9922d /clang/lib/CodeGen/CGClass.cpp | |
| parent | 8372006296ffcd23845acd0072c4bfbd24479be6 (diff) | |
| download | bcm5719-llvm-84852bbb42b5302682d70fc9969fa1c8e0ac84a4.tar.gz bcm5719-llvm-84852bbb42b5302682d70fc9969fa1c8e0ac84a4.zip | |
Revert r128770, r128771, r128773 and r128776 for now. It breaks debug info.
llvm-svn: 128842
Diffstat (limited to 'clang/lib/CodeGen/CGClass.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGClass.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp index ce41e845697..30f96efd79a 100644 --- a/clang/lib/CodeGen/CGClass.cpp +++ b/clang/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()); |
