Path to synthesize 'instance' size field of _objc_class metadata.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@43409 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Driver/RewriteTest.cpp b/Driver/RewriteTest.cpp
index 6ccc23a..db2c1ee 100644
--- a/Driver/RewriteTest.cpp
+++ b/Driver/RewriteTest.cpp
@@ -88,8 +88,6 @@
std::string &Result);
void SynthesizeObjcInternalStruct(ObjcInterfaceDecl *CDecl,
std::string &Result);
- void RewriteObjcInternalStructs(ObjcImplementationDecl *IDecl,
- std::string &Result);
void SynthesizeIvarOffsetComputation(ObjcImplementationDecl *IDecl,
ObjcIvarDecl *ivar,
std::string &Result);
@@ -795,9 +793,9 @@
? IDecl->getImplDeclNumIvars()
: (CDecl ? CDecl->getIntfDeclNumIvars() : 0);
+ SynthesizeObjcInternalStruct(CDecl, Result);
+
if (NumIvars > 0) {
- SynthesizeObjcInternalStruct(CDecl, Result);
-
static bool objc_ivar = false;
if (!objc_ivar) {
/* struct _objc_ivar {
@@ -971,8 +969,15 @@
Result += "\"";
}
// 'info' field is initialized to CLS_CLASS(1) for class
- // TODO: instance_size is curently set to 0.
- Result += ", 0,1,0";
+ Result += ", 0,1";
+ if (!ObjcSynthesizedStructs.count(CDecl))
+ Result += ",0";
+ else {
+ // class has size. Must synthesize its size.
+ Result += ",sizeof(struct _interface_";
+ Result += CDecl->getName();
+ Result += ")";
+ }
if (NumIvars > 0) {
Result += ", &_OBJC_INSTANCE_VARIABLES_";
Result += CDecl->getName();
diff --git a/clang.xcodeproj/project.pbxproj b/clang.xcodeproj/project.pbxproj
index de41b46..fe4cf8d 100644
--- a/clang.xcodeproj/project.pbxproj
+++ b/clang.xcodeproj/project.pbxproj
@@ -756,6 +756,7 @@
08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "clang" */;
+ compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 1;
mainGroup = 08FB7794FE84155DC02AAC07 /* clang */;
projectDirPath = "";