From fcf7f9fdcbec10a1d9640ad6960c7b6fe7a19fee Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Mon, 7 May 2012 14:17:47 +0000 Subject: [PATCH] Revert r156097, which appears to be causing some breakage. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@156304 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Rewrite/RewriteModernObjC.cpp | 4 ++-- test/Rewriter/objc-modern-getclass-proto.mm | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 test/Rewriter/objc-modern-getclass-proto.mm diff --git a/lib/Rewrite/RewriteModernObjC.cpp b/lib/Rewrite/RewriteModernObjC.cpp index e723d0c54f..b273871c2b 100644 --- a/lib/Rewrite/RewriteModernObjC.cpp +++ b/lib/Rewrite/RewriteModernObjC.cpp @@ -5743,11 +5743,11 @@ void RewriteModernObjC::Initialize(ASTContext &context) { 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. diff --git a/test/Rewriter/objc-modern-getclass-proto.mm b/test/Rewriter/objc-modern-getclass-proto.mm deleted file mode 100644 index 9885657063..0000000000 --- a/test/Rewriter/objc-modern-getclass-proto.mm +++ /dev/null @@ -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 - -@interface I @end -@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 *); -- 2.40.0