[cfe-commits] r153526 - in /cfe/trunk: lib/Rewrite/RewriteModernObjC.cpp test/Rewriter/objc-modern-class-init-hooks.mm
Fariborz Jahanian
fjahanian at apple.com
Tue Mar 27 11:41:05 PDT 2012
Author: fjahanian
Date: Tue Mar 27 13:41:05 2012
New Revision: 153526
URL: http://llvm.org/viewvc/llvm-project?rev=153526&view=rev
Log:
objective-c modern translator: move all inithooks into a single array
// rdar://11124354
Added:
cfe/trunk/test/Rewriter/objc-modern-class-init-hooks.mm
Modified:
cfe/trunk/lib/Rewrite/RewriteModernObjC.cpp
Modified: cfe/trunk/lib/Rewrite/RewriteModernObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Rewrite/RewriteModernObjC.cpp?rev=153526&r1=153525&r2=153526&view=diff
==============================================================================
--- cfe/trunk/lib/Rewrite/RewriteModernObjC.cpp (original)
+++ cfe/trunk/lib/Rewrite/RewriteModernObjC.cpp Tue Mar 27 13:41:05 2012
@@ -387,10 +387,13 @@
StringRef prefix, StringRef ClassName, std::string &Result);
virtual void RewriteObjCClassMetaData(ObjCImplementationDecl *IDecl,
std::string &Result);
+ virtual void RewriteClassSetupInitHook(std::string &Result);
+
virtual void RewriteMetaDataIntoBuffer(std::string &Result);
virtual void WriteImageInfo(std::string &Result);
virtual void RewriteObjCCategoryImplDecl(ObjCCategoryImplDecl *CDecl,
std::string &Result);
+ virtual void RewriteCategorySetupInitHook(std::string &Result);
// Rewriting ivar
virtual void RewriteIvarOffsetComputation(ObjCIvarDecl *ivar,
@@ -5767,25 +5770,17 @@
Result += "\tOBJC_CLASS_$_"; Result += CDecl->getNameAsString();
Result += ".cache = "; Result += "&_objc_empty_cache"; Result += ";\n";
Result += "}\n";
-
- Result += "#pragma section(\".objc_inithooks$B\", long, read, write)\n";
- Result += "__declspec(allocate(\".objc_inithooks$B\")) ";
- Result += "static void *OBJC_CLASS_SETUP2_$_";
- Result += CDecl->getNameAsString();
- Result += " = (void *)&OBJC_CLASS_SETUP_$_";
- Result += CDecl->getNameAsString();
- Result += ";\n\n";
}
static void Write_category_t(RewriteModernObjC &RewriteObj, ASTContext *Context,
std::string &Result,
- StringRef CatName,
+ ObjCCategoryDecl *CatDecl,
ObjCInterfaceDecl *ClassDecl,
ArrayRef<ObjCMethodDecl *> InstanceMethods,
ArrayRef<ObjCMethodDecl *> ClassMethods,
ArrayRef<ObjCProtocolDecl *> RefedProtocols,
ArrayRef<ObjCPropertyDecl *> ClassProperties) {
-
+ StringRef CatName = CatDecl->getName();
StringRef ClassName = ClassDecl->getName();
// must declare an extern class object in case this class is not implemented
// in this TU.
@@ -5855,18 +5850,6 @@
Result += CatName;
Result += ".cls = "; Result += "&OBJC_CLASS_$_"; Result += ClassName;
Result += ";\n}\n";
-
- Result += "#pragma section(\".objc_inithooks$B\", long, read, write)\n";
- Result += "__declspec(allocate(\".objc_inithooks$B\")) ";
- Result += "static void *OBJC_CATEGORY_SETUP2_$_";
- Result += ClassDecl->getNameAsString();
- Result += "_$_";
- Result += CatName;
- Result += " = (void *)&OBJC_CATEGORY_SETUP_$_";
- Result += ClassDecl->getNameAsString();
- Result += "_$_";
- Result += CatName;
- Result += ";\n\n";
}
static void Write__extendedMethodTypes_initializer(RewriteModernObjC &RewriteObj,
@@ -6385,6 +6368,22 @@
}
+void RewriteModernObjC::RewriteClassSetupInitHook(std::string &Result) {
+ int ClsDefCount = ClassImplementation.size();
+ if (!ClsDefCount)
+ return;
+ Result += "#pragma section(\".objc_inithooks$B\", long, read, write)\n";
+ Result += "__declspec(allocate(\".objc_inithooks$B\")) ";
+ Result += "static void *OBJC_CLASS_SETUP[] = {\n";
+ for (int i = 0; i < ClsDefCount; i++) {
+ ObjCImplementationDecl *IDecl = ClassImplementation[i];
+ ObjCInterfaceDecl *CDecl = IDecl->getClassInterface();
+ Result += "\t(void *)&OBJC_CLASS_SETUP_$_";
+ Result += CDecl->getName(); Result += ",\n";
+ }
+ Result += "};\n";
+}
+
void RewriteModernObjC::RewriteMetaDataIntoBuffer(std::string &Result) {
int ClsDefCount = ClassImplementation.size();
int CatDefCount = CategoryImplementation.size();
@@ -6393,10 +6392,14 @@
for (int i = 0; i < ClsDefCount; i++)
RewriteObjCClassMetaData(ClassImplementation[i], Result);
+ RewriteClassSetupInitHook(Result);
+
// For each implemented category, write out all its meta data.
for (int i = 0; i < CatDefCount; i++)
RewriteObjCCategoryImplDecl(CategoryImplementation[i], Result);
+ RewriteCategorySetupInitHook(Result);
+
if (ClsDefCount > 0) {
if (LangOpts.MicrosoftExt)
Result += "__declspec(allocate(\".objc_classlist$B\")) ";
@@ -6550,7 +6553,7 @@
FullCategoryName);
Write_category_t(*this, Context, Result,
- CDecl->getNameAsString(),
+ CDecl,
ClassDecl,
InstanceMethods,
ClassMethods,
@@ -6560,7 +6563,27 @@
// Determine if this category is also "non-lazy".
if (ImplementationIsNonLazy(IDecl))
DefinedNonLazyCategories.push_back(CDecl);
-
+
+}
+
+void RewriteModernObjC::RewriteCategorySetupInitHook(std::string &Result) {
+ int CatDefCount = CategoryImplementation.size();
+ if (!CatDefCount)
+ return;
+ Result += "#pragma section(\".objc_inithooks$B\", long, read, write)\n";
+ Result += "__declspec(allocate(\".objc_inithooks$B\")) ";
+ Result += "static void *OBJC_CATEGORY_SETUP[] = {\n";
+ for (int i = 0; i < CatDefCount; i++) {
+ ObjCCategoryImplDecl *IDecl = CategoryImplementation[i];
+ ObjCCategoryDecl *CatDecl= IDecl->getCategoryDecl();
+ ObjCInterfaceDecl *ClassDecl = IDecl->getClassInterface();
+ Result += "\t(void *)&OBJC_CATEGORY_SETUP_$_";
+ Result += ClassDecl->getName();
+ Result += "_$_";
+ Result += CatDecl->getName();
+ Result += ",\n";
+ }
+ Result += "};\n";
}
// RewriteObjCMethodsMetaData - Rewrite methods metadata for instance or
Added: cfe/trunk/test/Rewriter/objc-modern-class-init-hooks.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/objc-modern-class-init-hooks.mm?rev=153526&view=auto
==============================================================================
--- cfe/trunk/test/Rewriter/objc-modern-class-init-hooks.mm (added)
+++ cfe/trunk/test/Rewriter/objc-modern-class-init-hooks.mm Tue Mar 27 13:41:05 2012
@@ -0,0 +1,36 @@
+// RUN: %clang_cc1 -E %s -o %t.mm
+// RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %t.mm -o - | FileCheck %s
+// rdar:// 11124354
+
+ at interface Root @end
+
+ at interface Super : Root
+ at end
+
+ at interface Sub : Super
+ at end
+
+ at implementation Sub @end
+
+ at implementation Root @end
+
+ at interface Root(Cat) @end
+
+ at interface Sub(Cat) @end
+
+ at implementation Root(Cat) @end
+
+ at implementation Sub(Cat) @end
+
+
+// CHECK: #pragma section(".objc_inithooks$B", long, read, write)
+// CHECK: __declspec(allocate(".objc_inithooks$B")) static void *OBJC_CLASS_SETUP[] = {
+// CHECK: (void *)&OBJC_CLASS_SETUP_$_Sub,
+// CHECK: (void *)&OBJC_CLASS_SETUP_$_Root,
+// CHECK: };
+
+// CHECK: #pragma section(".objc_inithooks$B", long, read, write)
+// CHECK: __declspec(allocate(".objc_inithooks$B")) static void *OBJC_CATEGORY_SETUP[] = {
+// CHECK: (void *)&OBJC_CATEGORY_SETUP_$_Root_$_Cat,
+// CHECK: (void *)&OBJC_CATEGORY_SETUP_$_Sub_$_Cat,
+// CHECK: };
More information about the cfe-commits
mailing list