From d76f43836968a40c4c33c2006d5bcebca41d87d1 Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Tue, 10 Nov 2009 22:48:10 +0000 Subject: [PATCH] Revert r86741; it doesn't handle virtual bases correctly. llvm-svn: 86745 --- clang/lib/CodeGen/CGCXXClass.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/clang/lib/CodeGen/CGCXXClass.cpp b/clang/lib/CodeGen/CGCXXClass.cpp index 668139ffb521..56a28fc9a007 100644 --- a/clang/lib/CodeGen/CGCXXClass.cpp +++ b/clang/lib/CodeGen/CGCXXClass.cpp @@ -127,14 +127,7 @@ CodeGenFunction::GetAddressCXXOfBaseClass(llvm::Value *BaseValue, // Just cast back. return Builder.CreateBitCast(BaseValue, BasePtrTy); } - - llvm::Value *Offset = - GetCXXBaseClassOffset(*this, BaseValue, ClassDecl, BaseClassDecl); - - // If there is no offset, simply cast the pointer and return it. - if (!Offset) - return Builder.CreateBitCast(BaseValue, BasePtrTy); - + llvm::BasicBlock *CastNull = 0; llvm::BasicBlock *CastNotNull = 0; llvm::BasicBlock *CastEnd = 0; @@ -152,10 +145,15 @@ CodeGenFunction::GetAddressCXXOfBaseClass(llvm::Value *BaseValue, } const llvm::Type *Int8PtrTy = llvm::Type::getInt8PtrTy(VMContext); + + llvm::Value *Offset = + GetCXXBaseClassOffset(*this, BaseValue, ClassDecl, BaseClassDecl); - // Apply the offset. - BaseValue = Builder.CreateBitCast(BaseValue, Int8PtrTy); - BaseValue = Builder.CreateGEP(BaseValue, Offset, "add.ptr"); + if (Offset) { + // Apply the offset. + BaseValue = Builder.CreateBitCast(BaseValue, Int8PtrTy); + BaseValue = Builder.CreateGEP(BaseValue, Offset, "add.ptr"); + } // Cast back. BaseValue = Builder.CreateBitCast(BaseValue, BasePtrTy);