Author: fjahanian
Date: Tue Mar 20 12:34:50 2012
New Revision: 153098

URL: http://llvm.org/viewvc/llvm-project?rev=153098&view=rev
Log:
modern objective-c translator: couple of minor
changes to how meta-data is declared. 
// rdar://11076938

Modified:
    cfe/trunk/lib/Rewrite/RewriteModernObjC.cpp
    cfe/trunk/test/Rewriter/objc-modern-ivar-receiver-1.mm

Modified: cfe/trunk/lib/Rewrite/RewriteModernObjC.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Rewrite/RewriteModernObjC.cpp?rev=153098&r1=153097&r2=153098&view=diff
==============================================================================
--- cfe/trunk/lib/Rewrite/RewriteModernObjC.cpp (original)
+++ cfe/trunk/lib/Rewrite/RewriteModernObjC.cpp Tue Mar 20 12:34:50 2012
@@ -5269,7 +5269,7 @@
 
 /// struct _class_t {
 ///   struct _class_t *isa;
-///   struct _class_t * const superclass;
+///   struct _class_t *superclass;
 ///   void *cache;
 ///   IMP *vtable;
 ///   struct _class_ro_t *ro;
@@ -5354,7 +5354,7 @@
   
   Result += "\nstruct _class_t {\n";
   Result += "\tstruct _class_t *isa;\n";
-  Result += "\tstruct _class_t *const superclass;\n";
+  Result += "\tstruct _class_t *superclass;\n";
   Result += "\tvoid *cache;\n";
   Result += "\tvoid *vtable;\n";
   Result += "\tstruct _class_ro_t *ro;\n";
@@ -5369,7 +5369,7 @@
   Result += "\tconst struct _prop_list_t *const properties;\n";
   Result += "};\n";
   
-  Result += "extern void *_objc_empty_cache;\n";
+  Result += "__declspec(dllimport) extern struct objc_cache 
_objc_empty_cache;\n";
   Result += "extern void *_objc_empty_vtable;\n";
   
   meta_data_declared = true;

Modified: cfe/trunk/test/Rewriter/objc-modern-ivar-receiver-1.mm
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/objc-modern-ivar-receiver-1.mm?rev=153098&r1=153097&r2=153098&view=diff
==============================================================================
--- cfe/trunk/test/Rewriter/objc-modern-ivar-receiver-1.mm (original)
+++ cfe/trunk/test/Rewriter/objc-modern-ivar-receiver-1.mm Tue Mar 20 12:34:50 
2012
@@ -26,3 +26,6 @@
 @end
 
 // CHECK: id obj = (*(id *)((char *)newInv + 
OBJC_IVAR_$_NSInvocation$_container));
+// rdar://11076938
+// CHECK: struct _class_t *superclass;
+// CHECK: __declspec(dllimport) extern struct objc_cache _objc_empty_cache;


_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits

Reply via email to