[cfe-commits] r156304 - in /cfe/trunk: lib/Rewrite/RewriteModernObjC.cpp test/Rewriter/objc-modern-getclass-proto.mm

[Douglas Gregor]

Author: dgregor
Date: Mon May  7 09:17:47 2012
New Revision: 156304

URL: http://llvm.org/viewvc/llvm-project?rev=156304&view=rev
Log:
Revert r156097, which appears to be causing some breakage.

Removed:
    cfe/trunk/test/Rewriter/objc-modern-getclass-proto.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=156304&r1=156303&r2=156304&view=diff
==============================================================================
--- cfe/trunk/lib/Rewrite/RewriteModernObjC.cpp (original)
+++ cfe/trunk/lib/Rewrite/RewriteModernObjC.cpp Mon May  7 09:17:47 2012
@@ -5743,11 +5743,11 @@
   Preamble += "__OBJC_RW_DLLIMPORT void objc_msgSendSuper_stret(void);\n";
   Preamble += "__OBJC_RW_DLLIMPORT void objc_msgSend_fpret(void);\n";
 
-  Preamble += "__OBJC_RW_DLLIMPORT struct objc_class *objc_getClass";
+  Preamble += "__OBJC_RW_DLLIMPORT struct objc_object *objc_getClass";
   Preamble += "(const char *);\n";
   Preamble += "__OBJC_RW_DLLIMPORT struct objc_class *class_getSuperclass";
   Preamble += "(struct objc_class *);\n";
-  Preamble += "__OBJC_RW_DLLIMPORT struct objc_class *objc_getMetaClass";
+  Preamble += "__OBJC_RW_DLLIMPORT struct objc_object *objc_getMetaClass";
   Preamble += "(const char *);\n";
   Preamble += "__OBJC_RW_DLLIMPORT void objc_exception_throw( struct objc_object *);\n";
   // @synchronized hooks.

Removed: cfe/trunk/test/Rewriter/objc-modern-getclass-proto.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/objc-modern-getclass-proto.mm?rev=156303&view=auto
==============================================================================
--- cfe/trunk/test/Rewriter/objc-modern-getclass-proto.mm (original)
+++ cfe/trunk/test/Rewriter/objc-modern-getclass-proto.mm (removed)
@@ -1,9 +0,0 @@
-// RUN: %clang_cc1 -E %s -o %t.mm
-// RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc -fobjc-fragile-abi %t.mm -o %t-rw.cpp
-// rdar://11375495
-
- at interface I @end
- at implementation I @end
-
-// CHECK: __OBJC_RW_DLLIMPORT struct objc_class *objc_getClass(const char *);
-// CHECK: __OBJC_RW_DLLIMPORT struct objc_class *objc_getMetaClass(const char *);