Some refactoring of Ivar offset code gen.
in preparation for nonfragile ivar offset work.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64225 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGObjCMac.cpp b/lib/CodeGen/CGObjCMac.cpp
index 275bdf7..43da911 100644
--- a/lib/CodeGen/CGObjCMac.cpp
+++ b/lib/CodeGen/CGObjCMac.cpp
@@ -590,6 +590,9 @@
const ObjCIvarDecl *Ivar,
const FieldDecl *Field,
unsigned CVRQualifiers);
+ virtual llvm::Value *EmitIvarOffset(CodeGen::CodeGenFunction &CGF,
+ ObjCInterfaceDecl *Interface,
+ const ObjCIvarDecl *Ivar);
};
class CGObjCNonFragileABIMac : public CGObjCCommonMac {
@@ -704,9 +707,12 @@
virtual llvm::Value *GenerateProtocolRef(CGBuilderTy &Builder,
const ObjCProtocolDecl *PD);
- virtual llvm::Function *GetPropertyGetFunction(){ return 0; }
- virtual llvm::Function *GetPropertySetFunction()
- { return 0; }
+ virtual llvm::Function *GetPropertyGetFunction(){
+ return ObjCTypes.GetPropertyFn;
+ }
+ virtual llvm::Function *GetPropertySetFunction(){
+ return ObjCTypes.SetPropertyFn;
+ }
virtual llvm::Function *EnumerationMutationFunction()
{ return 0; }
@@ -737,6 +743,10 @@
const ObjCIvarDecl *Ivar,
const FieldDecl *Field,
unsigned CVRQualifiers);
+ virtual llvm::Value *EmitIvarOffset(CodeGen::CodeGenFunction &CGF,
+ ObjCInterfaceDecl *Interface,
+ const ObjCIvarDecl *Ivar);
+ virtual bool LateBoundIVars() const { return true; }
};
} // end anonymous namespace
@@ -2170,6 +2180,22 @@
return LV;
}
+llvm::Value *CGObjCMac::EmitIvarOffset(CodeGen::CodeGenFunction &CGF,
+ ObjCInterfaceDecl *Interface,
+ const ObjCIvarDecl *Ivar) {
+ const llvm::Type *InterfaceLTy =
+ CGM.getTypes().ConvertType(CGM.getContext().getObjCInterfaceType(Interface));
+ const llvm::StructLayout *Layout =
+ CGM.getTargetData().getStructLayout(cast<llvm::StructType>(InterfaceLTy));
+ FieldDecl *Field = Interface->lookupFieldDeclForIvar(CGM.getContext(), Ivar);
+ uint64_t Offset =
+ Layout->getElementOffset(CGM.getTypes().getLLVMFieldNo(Field));
+
+ return llvm::ConstantInt::get(
+ CGM.getTypes().ConvertType(CGM.getContext().LongTy),
+ Offset);
+}
+
/* *** Private Interface *** */
/// EmitImageInfo - Emit the image info marker used to encode some module
@@ -4280,6 +4306,13 @@
return LV;
}
+llvm::Value *CGObjCNonFragileABIMac::EmitIvarOffset(
+ CodeGen::CodeGenFunction &CGF,
+ ObjCInterfaceDecl *Interface,
+ const ObjCIvarDecl *Ivar) {
+ return 0;
+}
+
CodeGen::RValue CGObjCNonFragileABIMac::EmitMessageSend(
CodeGen::CodeGenFunction &CGF,
QualType ResultType,