maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Add CGObjCRuntime::GetConcreteClassStruct to encapsulate access to the 

underlying llvm::StructType for an interface.

llvm-svn: 69796
This commit is contained in:
Daniel Dunbar 2009-04-22 09:39:34 +00:00
parent 66cb01313b
commit 7b4dfc8b78
3 changed files with 24 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clang/lib/CodeGen/CGObjCGNU.cpp
View File

@ -735,12 +735,7 @@ void CGObjCGNU::GenerateClass(const ObjCImplementationDecl *OID) {
// Get the size of instances. For runtimes that support late-bound instances
// this should probably be something different (size just of instance
// varaibles in this class, not superclasses?).
const llvm::Type *ObjTy;
if (ClassDecl->isForwardDecl())
ObjTy = llvm::StructType::get(NULL, NULL);
else
ObjTy = CGM.getTypes().ConvertType(Context.getObjCInterfaceType(ClassDecl));
const llvm::Type *ObjTy = GetConcreteClassStruct(CGM, ClassDecl);
int instanceSize = CGM.getTargetData().getTypePaddedSize(ObjTy);
// Collect information about instance variables.
@ -1085,9 +1080,7 @@ llvm::Value *CGObjCGNU::EmitIvarOffset(CodeGen::CodeGenFunction &CGF,
const ObjCInterfaceDecl *Interface,
const ObjCIvarDecl *Ivar) {
uint64_t Offset = ComputeIvarBaseOffset(CGF.CGM, Interface, Ivar);
return llvm::ConstantInt::get(
CGM.getTypes().ConvertType(CGM.getContext().LongTy),
Offset);
return llvm::ConstantInt::get(LongTy, Offset);
}
CodeGen::CGObjCRuntime *CodeGen::CreateGNUObjCRuntime(CodeGen::CodeGenModule &CGM){

39
clang/lib/CodeGen/CGObjCMac.cpp
View File

@ -33,15 +33,22 @@ using namespace CodeGen;
// don't belong in CGObjCRuntime either so we will live with it for
// now.
const llvm::StructType *
CGObjCRuntime::GetConcreteClassStruct(CodeGen::CodeGenModule &CGM,
const ObjCInterfaceDecl *OID) {
assert(!OID->isForwardDecl() && "Invalid interface decl!");
QualType T = CGM.getContext().getObjCInterfaceType(OID);
return cast<llvm::StructType>(CGM.getTypes().ConvertType(T));
}
uint64_t CGObjCRuntime::ComputeIvarBaseOffset(CodeGen::CodeGenModule &CGM,
const ObjCInterfaceDecl *OID,
const ObjCIvarDecl *Ivar) {
assert(!OID->isForwardDecl() && "Invalid interface decl!");
QualType T = CGM.getContext().getObjCInterfaceType(OID);
const llvm::StructType *InterfaceTy =
cast<llvm::StructType>(CGM.getTypes().ConvertType(T));
const llvm::StructType *STy = GetConcreteClassStruct(CGM, OID);
const llvm::StructLayout *Layout =
CGM.getTargetData().getStructLayout(InterfaceTy);
CGM.getTargetData().getStructLayout(STy);
const FieldDecl *Field =
OID->lookupFieldDeclForIvar(CGM.getContext(), Ivar);
if (!Field->isBitField())
@ -768,11 +775,6 @@ protected:
/// name. The return value has type char *.
llvm::Constant *GetClassName(IdentifierInfo *Ident);
/// GetInterfaceDeclStructLayout - Get layout for ivars of given
/// interface declaration.
const llvm::StructLayout *GetInterfaceDeclStructLayout(
const ObjCInterfaceDecl *ID) const;
/// BuildIvarLayout - Builds ivar layout bitmap for the class
/// implementation for the __strong or __weak case.
///
@ -1820,12 +1822,7 @@ void CGObjCMac::GenerateClass(const ObjCImplementationDecl *ID) {
EmitProtocolList("\01L_OBJC_CLASS_PROTOCOLS_" + ID->getNameAsString(),
Interface->protocol_begin(),
Interface->protocol_end());
const llvm::Type *InterfaceTy;
if (Interface->isForwardDecl())
InterfaceTy = llvm::StructType::get(NULL, NULL);
else
InterfaceTy =
CGM.getTypes().ConvertType(CGM.getContext().getObjCInterfaceType(Interface));
const llvm::Type *InterfaceTy = GetConcreteClassStruct(CGM, Interface);
unsigned Flags = eClassFlags_Factory;
unsigned Size = CGM.getTargetData().getTypePaddedSize(InterfaceTy);
@ -2857,17 +2854,6 @@ llvm::Constant *CGObjCCommonMac::GetClassName(IdentifierInfo *Ident) {
return getConstantGEP(Entry, 0, 0);
}
/// GetInterfaceDeclStructLayout - Get layout for ivars of given
/// interface declaration.
const llvm::StructLayout *CGObjCCommonMac::GetInterfaceDeclStructLayout(
const ObjCInterfaceDecl *OID) const {
assert(!OID->isForwardDecl() && "Invalid interface decl!");
QualType T = CGM.getContext().getObjCInterfaceType(OID);
const llvm::StructType *InterfaceTy =
cast<llvm::StructType>(CGM.getTypes().ConvertType(T));
return CGM.getTargetData().getStructLayout(InterfaceTy);
}
/// GetIvarLayoutName - Returns a unique constant for the given
/// ivar layout bitmap.
llvm::Constant *CGObjCCommonMac::GetIvarLayoutName(IdentifierInfo *Ident,
@ -3133,7 +3119,8 @@ llvm::Constant *CGObjCCommonMac::BuildIvarLayout(
SkipIvars.clear();
IvarsInfo.clear();
const llvm::StructLayout *Layout = GetInterfaceDeclStructLayout(OI);
const llvm::StructLayout *Layout =
CGM.getTargetData().getStructLayout(GetConcreteClassStruct(CGM, OI));
BuildAggrIvarLayout(OI, Layout, 0, RecFields, 0, ForStrongLayout,
Index, SkIndex, hasUnion);
if (Index == -1)

12
clang/lib/CodeGen/CGObjCRuntime.h
View File

@ -28,6 +28,7 @@ namespace llvm {
class Function;
class Module;
class StructLayout;
class StructType;
class Type;
class Value;
}
@ -65,9 +66,14 @@ protected:
// eventually be folded into other places (the structure layout
// code).
// Compute an offset to the given ivar, suitable for passing to
// EmitValueForIvarAtOffset. Note that the correct handling of
// bit-fields is carefully coordinated by these two, use caution!
/// Return the (fixed) LLVM struct type for the interface. This is
/// only very meaningful for runtimes which use a non-fragile ABI.
const llvm::StructType * GetConcreteClassStruct(CodeGen::CodeGenModule &CGM,
const ObjCInterfaceDecl *OID);
/// Compute an offset to the given ivar, suitable for passing to
/// EmitValueForIvarAtOffset. Note that the correct handling of
/// bit-fields is carefully coordinated by these two, use caution!
uint64_t ComputeIvarBaseOffset(CodeGen::CodeGenModule &CGM,
const ObjCInterfaceDecl *OID,
const ObjCIvarDecl *Ivar);