OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

Revert r86741; it doesn't handle virtual bases correctly. 

llvm-svn: 86745
This commit is contained in:
Eli Friedman 2009-11-10 22:48:10 +00:00
parent 0960059c0c
commit d76f438369
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
clang/lib/CodeGen/CGCXXClass.cpp
View File

@ -127,14 +127,7 @@ CodeGenFunction::GetAddressCXXOfBaseClass(llvm::Value *BaseValue,
// Just cast back. // Just cast back.
return Builder.CreateBitCast(BaseValue, BasePtrTy); 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 *CastNull = 0;
llvm::BasicBlock *CastNotNull = 0; llvm::BasicBlock *CastNotNull = 0;
llvm::BasicBlock *CastEnd = 0; llvm::BasicBlock *CastEnd = 0;
@ -152,10 +145,15 @@ CodeGenFunction::GetAddressCXXOfBaseClass(llvm::Value *BaseValue,
} }
const llvm::Type *Int8PtrTy = llvm::Type::getInt8PtrTy(VMContext); const llvm::Type *Int8PtrTy = llvm::Type::getInt8PtrTy(VMContext);
llvm::Value *Offset =
GetCXXBaseClassOffset(*this, BaseValue, ClassDecl, BaseClassDecl);
// Apply the offset. if (Offset) {
BaseValue = Builder.CreateBitCast(BaseValue, Int8PtrTy); // Apply the offset.
BaseValue = Builder.CreateGEP(BaseValue, Offset, "add.ptr"); BaseValue = Builder.CreateBitCast(BaseValue, Int8PtrTy);
BaseValue = Builder.CreateGEP(BaseValue, Offset, "add.ptr");
}
// Cast back. // Cast back.
BaseValue = Builder.CreateBitCast(BaseValue, BasePtrTy); BaseValue = Builder.CreateBitCast(BaseValue, BasePtrTy);