diff options
| -rw-r--r-- | Driver/RewriteTest.cpp | 17 | ||||
| -rw-r--r-- | clang.xcodeproj/project.pbxproj | 1 |
2 files changed, 12 insertions, 6 deletions
diff --git a/Driver/RewriteTest.cpp b/Driver/RewriteTest.cpp index 6ccc23ae09..db2c1ee70b 100644 --- a/Driver/RewriteTest.cpp +++ b/Driver/RewriteTest.cpp @@ -88,8 +88,6 @@ namespace { 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 @@ void RewriteTest::RewriteObjcClassMetaData(ObjcImplementationDecl *IDecl, ? 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 @@ void RewriteTest::RewriteObjcClassMetaData(ObjcImplementationDecl *IDecl, 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 de41b4628d..fe4cf8d85b 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 = ""; |