rethrow is really the language independent primitive here. "throw" can be written

in terms of it and llvm.exc.setcurrent.

Rework the intrinsics.

llvm-svn: 8110

1 files changed, 4 insertions, 2 deletions

diff --git a/llvm/lib/VMCore/Function.cpp b/llvm/lib/VMCore/Function.cpp
index 4527372ae75..ce190c80a3f 100644
--- a/llvm/lib/VMCore/Function.cpp
+++ b/llvm/lib/VMCore/Function.cpp
@@ -197,8 +197,7 @@ unsigned Function::getIntrinsicID() const {
     break;
   case 'e':
     if (getName() == "llvm.exc.getcurrent")return LLVMIntrinsic::exc_getcurrent;
-    if (getName() == "llvm.exc.rethrow")   return LLVMIntrinsic::exc_rethrow;
-    if (getName() == "llvm.exc.throw")     return LLVMIntrinsic::exc_throw;
+    if (getName() == "llvm.exc.setcurrent")return LLVMIntrinsic::exc_setcurrent;
     break;
   case 'l':
     if (getName() == "llvm.longjmp")  return LLVMIntrinsic::longjmp;
@@ -208,6 +207,9 @@ unsigned Function::getIntrinsicID() const {
     if (getName() == "llvm.sigsetjmp")  return LLVMIntrinsic::sigsetjmp;
     if (getName() == "llvm.siglongjmp") return LLVMIntrinsic::siglongjmp;
     break;
+  case 'u':
+    if (getName() == "llvm.unwind")     return LLVMIntrinsic::unwind;
+    break;
   case 'v':
     if (getName() == "llvm.va_copy")  return LLVMIntrinsic::va_copy;
     if (getName() == "llvm.va_end")   return LLVMIntrinsic::va_end;