[cfe-commits] r77458 - /cfe/trunk/lib/CodeGen/CGCXX.cpp
Fariborz Jahanian
fjahanian at apple.com
Wed Jul 29 08:54:57 PDT 2009
Author: fjahanian
Date: Wed Jul 29 10:54:56 2009
New Revision: 77458
URL: http://llvm.org/viewvc/llvm-project?rev=77458&view=rev
Log:
Use the existing API for base offset. Use suitable llvm type
for offset ir-gen.
Modified:
cfe/trunk/lib/CodeGen/CGCXX.cpp
Modified: cfe/trunk/lib/CodeGen/CGCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCXX.cpp?rev=77458&r1=77457&r2=77458&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGCXX.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGCXX.cpp Wed Jul 29 10:54:56 2009
@@ -167,26 +167,10 @@
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 =
More information about the cfe-commits
mailing list