From 89623deca10793927d85c2548ead5e3509b69b65 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Wed, 22 Apr 2009 08:20:31 +0000 Subject: Use ComputeIvarBaseOffset instead of looking up by hand. llvm-svn: 69789 --- clang/lib/CodeGen/CGObjCGNU.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'clang/lib/CodeGen') diff --git a/clang/lib/CodeGen/CGObjCGNU.cpp b/clang/lib/CodeGen/CGObjCGNU.cpp index b3054cce357..9c3449f5008 100644 --- a/clang/lib/CodeGen/CGObjCGNU.cpp +++ b/clang/lib/CodeGen/CGObjCGNU.cpp @@ -747,8 +747,6 @@ void CGObjCGNU::GenerateClass(const ObjCImplementationDecl *OID) { llvm::SmallVector IvarNames; llvm::SmallVector IvarTypes; llvm::SmallVector IvarOffsets; - const llvm::StructLayout *Layout = - CGM.getTargetData().getStructLayout(cast(ObjTy)); ObjTy = llvm::PointerType::getUnqual(ObjTy); for (ObjCInterfaceDecl::ivar_iterator iter = ClassDecl->ivar_begin(), endIter = ClassDecl->ivar_end() ; iter != endIter ; iter++) { @@ -760,12 +758,9 @@ void CGObjCGNU::GenerateClass(const ObjCImplementationDecl *OID) { Context.getObjCEncodingForType((*iter)->getType(), TypeStr); IvarTypes.push_back(CGM.GetAddrOfConstantCString(TypeStr)); // Get the offset - const FieldDecl *Field = - ClassDecl->lookupFieldDeclForIvar(Context, (*iter)); - int offset = - (int)Layout->getElementOffset(CGM.getTypes().getLLVMFieldNo(Field)); + uint64_t Offset = ComputeIvarBaseOffset(CGM, ClassDecl, *iter); IvarOffsets.push_back( - llvm::ConstantInt::get(llvm::Type::Int32Ty, offset)); + llvm::ConstantInt::get(llvm::Type::Int32Ty, Offset)); } // Collect information about instance methods -- cgit v1.2.3