[cfe-commits] r116660 - in /cfe/trunk: lib/CodeGen/CGObjCMac.cpp test/CodeGenObjC/method-signatures.m

[Daniel Dunbar]

Author: ddunbar
Date: Sat Oct 16 00:04:10 2010
New Revision: 116660

URL: http://llvm.org/viewvc/llvm-project?rev=116660&view=rev
Log:
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.

Removed:
    cfe/trunk/test/CodeGenObjC/method-signatures.m
Modified:
    cfe/trunk/lib/CodeGen/CGObjCMac.cpp

Modified: cfe/trunk/lib/CodeGen/CGObjCMac.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGObjCMac.cpp?rev=116660&r1=116659&r2=116660&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGObjCMac.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGObjCMac.cpp Sat Oct 16 00:04:10 2010
@@ -462,7 +462,7 @@
     // 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");
   }
   

Removed: cfe/trunk/test/CodeGenObjC/method-signatures.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/method-signatures.m?rev=116659&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenObjC/method-signatures.m (original)
+++ cfe/trunk/test/CodeGenObjC/method-signatures.m (removed)
@@ -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 {
-  }
-}