Revert r116656, "IRgen/Obj-C/NeXT: Fix the IR signature for

objc_exception_rethrow, so we don't...", since something is actually trying to
call this with the wrong signature (!). Unfortunately I don't understand the new
EH infrastructure well enough to fix it immediately.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@116660 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CGObjCMac.cpp b/lib/CodeGen/CGObjCMac.cpp
index 3440959408ea342bcadd5ab865e7f235c61b5a4f..8b3fd499b66286538dcdef377a288c9dda13ae5e 100644 (file)
--- a/lib/CodeGen/CGObjCMac.cpp
+++ b/lib/CodeGen/CGObjCMac.cpp
@@ -462,7 +462,7 @@ public:
     // void objc_exception_rethrow(void)
     std::vector<const llvm::Type*> Args;
     llvm::FunctionType *FTy =
-      llvm::FunctionType::get(llvm::Type::getVoidTy(VMContext), Args, false);
+      llvm::FunctionType::get(llvm::Type::getVoidTy(VMContext), Args, true);
     return CGM.CreateRuntimeFunction(FTy, "objc_exception_rethrow");
   }
   

diff --git a/test/CodeGenObjC/method-signatures.m b/test/CodeGenObjC/method-signatures.m
deleted file mode 100644 (file)
index b035709..0000000
--- a/test/CodeGenObjC/method-signatures.m
+++ /dev/null
@@ -1,14 +0,0 @@
-// Check method signatures for synthesized runtime functions.
-//
-// RUN: %clang_cc1 -triple x86_64-apple-darwin10 \
-// RUN:    -fexceptions -fobjc-nonfragile-abi2 -emit-llvm -o %t %s
-// RUN: FileCheck < %t %s
-
-// CHECK: declare void @objc_exception_rethrow()
-void f1(void);
-void f0() {
-  @try {
-    f1();
-  } @finally {
-  }
-}