forked from OSchip/llvm-project
Use the existing API for base offset. Use suitable llvm type
for offset ir-gen. llvm-svn: 77458
This commit is contained in:
parent
b2cde2db67
commit
72b1f24bd2
|
@ -167,26 +167,10 @@ llvm::Value *CodeGenFunction::AddressCXXOfBaseClass(llvm::Value *BaseValue,
|
|||
const ASTRecordLayout &Layout =
|
||||
getContext().getASTRecordLayout(ClassDecl);
|
||||
llvm::Type *I8Ptr = VMContext.getPointerTypeUnqual(llvm::Type::Int8Ty);
|
||||
unsigned Idx = 0;
|
||||
bool DerivedToBaseConversion = false;
|
||||
for (CXXRecordDecl::base_class_const_iterator i =
|
||||
ClassDecl->bases_begin(),
|
||||
e = ClassDecl->bases_end(); i != e; ++i, ++Idx) {
|
||||
if (!i->isVirtual()) {
|
||||
const CXXRecordDecl *Base =
|
||||
cast<CXXRecordDecl>(i->getType()->getAsRecordType()->getDecl());
|
||||
if (Base == BaseClassDecl) {
|
||||
DerivedToBaseConversion = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!DerivedToBaseConversion) {
|
||||
assert(false && "FIXME - Only derived to imm. base convesion is supported");
|
||||
return BaseValue;
|
||||
}
|
||||
uint64_t Offset = Layout.getFieldOffset(Idx) / 8;
|
||||
llvm::Value *OffsetVal = llvm::ConstantInt::get(llvm::Type::Int32Ty, Offset);
|
||||
uint64_t Offset = Layout.getBaseClassOffset(BaseClassDecl) / 8;
|
||||
llvm::Value *OffsetVal =
|
||||
llvm::ConstantInt::get(
|
||||
CGM.getTypes().ConvertType(CGM.getContext().LongTy), Offset);
|
||||
BaseValue = Builder.CreateBitCast(BaseValue, I8Ptr);
|
||||
BaseValue = Builder.CreateGEP(BaseValue, OffsetVal, "add.ptr");
|
||||
QualType BTy =
|
||||
|
|
Loading…
Reference in New Issue