modern objective-c translator: add static function to initialize
the class pointer in the category structure.
// rdar://11076938
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@153138 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Rewrite/RewriteModernObjC.cpp b/lib/Rewrite/RewriteModernObjC.cpp
index 3c9c5dd..fed50b1 100644
--- a/lib/Rewrite/RewriteModernObjC.cpp
+++ b/lib/Rewrite/RewriteModernObjC.cpp
@@ -5277,7 +5277,7 @@
/// struct _category_t {
/// const char * const name;
-/// struct _class_t *const cls;
+/// struct _class_t *cls;
/// const struct _method_list_t * const instance_methods;
/// const struct _method_list_t * const class_methods;
/// const struct _protocol_list_t * const protocols;
@@ -5362,7 +5362,7 @@
Result += "\nstruct _category_t {\n";
Result += "\tconst char * const name;\n";
- Result += "\tstruct _class_t *const cls;\n";
+ Result += "\tstruct _class_t *cls;\n";
Result += "\tconst struct _method_list_t *const instance_methods;\n";
Result += "\tconst struct _method_list_t *const class_methods;\n";
Result += "\tconst struct _protocol_list_t *const protocols;\n";
@@ -5753,7 +5753,7 @@
Result += " __attribute__ ((used, section (\"__DATA,__objc_const\"))) = \n";
Result += "{\n";
Result += "\t\""; Result += ClassName; Result += "\",\n";
- Result += "\t&"; Result += "OBJC_CLASS_$_"; Result += ClassName;
+ Result += "\t0, // &"; Result += "OBJC_CLASS_$_"; Result += ClassName;
Result += ",\n";
if (InstanceMethods.size() > 0) {
Result += "\t(const struct _method_list_t *)&";
@@ -5791,6 +5791,31 @@
Result += "\t0,\n";
Result += "};\n";
+
+ // Add static function to initialize the class pointer in the category structure.
+ Result += "static void OBJC_CATEGORY_SETUP_$_";
+ Result += ClassDecl->getNameAsString();
+ Result += "_$_";
+ Result += CatName;
+ Result += "(void ) {\n";
+ Result += "\t_OBJC_$_CATEGORY_";
+ Result += ClassDecl->getNameAsString();
+ Result += "_$_";
+ 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,
diff --git a/test/Rewriter/objc-modern-class-init.mm b/test/Rewriter/objc-modern-class-init.mm
index 4a21bc4..b0326a4 100644
--- a/test/Rewriter/objc-modern-class-init.mm
+++ b/test/Rewriter/objc-modern-class-init.mm
@@ -13,3 +13,11 @@
@implementation Sub @end
@implementation Root @end
+
+@interface Root(Cat) @end
+
+@interface Sub(Cat) @end
+
+@implementation Root(Cat) @end
+
+@implementation Sub(Cat) @end