As it turns out, things will be simpler than I first expected. We no longer

need any exception handling intrinsics beyond llvm.unwind. (yaay)

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

diff --git a/include/llvm/Intrinsics.h b/include/llvm/Intrinsics.h
index 6c7f6c534a66f8e06b000382564824ef672ecc37..6445eff6be756bed91e6e5c2c57e1956e38d0e22 100644 (file)
--- a/include/llvm/Intrinsics.h
+++ b/include/llvm/Intrinsics.h
@@ -24,10 +24,6 @@ namespace LLVMIntrinsic {
 
     unwind,         // Unwind stack until containing invoke is found
 
-    // Exception handling intrinsics...
-    exc_setcurrent, // Set the current pending exception
-    exc_getcurrent, // Get the current pending exception
-
     // Setjmp/Longjmp intrinsics...
     setjmp,         // Used to represent a setjmp call in C
     longjmp,        // Used to represent a longjmp call in C

diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp
index ce190c80a3f0f02c86fb499c82fbd97fa5ea03ba..ccbe4c224481854c72401ad508685fd82daf568b 100644 (file)
--- a/lib/VMCore/Function.cpp
+++ b/lib/VMCore/Function.cpp
@@ -195,10 +195,6 @@ unsigned Function::getIntrinsicID() const {
         if (getName() == alpha_intrinsics[i].name)
           return alpha_intrinsics[i].id;
     break;
-  case 'e':
-    if (getName() == "llvm.exc.getcurrent")return LLVMIntrinsic::exc_getcurrent;
-    if (getName() == "llvm.exc.setcurrent")return LLVMIntrinsic::exc_setcurrent;
-    break;
   case 'l':
     if (getName() == "llvm.longjmp")  return LLVMIntrinsic::longjmp;
     break;

diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp
index 23ad6421bb3f45063fe1d382778a3335dfb21ad5..138542c06fb4d52b3e6b475fabe917253cdb193d 100644 (file)
--- a/lib/VMCore/Verifier.cpp
+++ b/lib/VMCore/Verifier.cpp
@@ -523,8 +523,6 @@ void Verifier::visitIntrinsicFunctionCall(LLVMIntrinsic::ID ID, CallInst &CI) {
   case LLVMIntrinsic::va_copy:         NumArgs = 2; break;
 
   case LLVMIntrinsic::unwind:          NumArgs = 0; break;
-  case LLVMIntrinsic::exc_setcurrent:  NumArgs = 1; break;
-  case LLVMIntrinsic::exc_getcurrent:  NumArgs = 0; break;
 
   case LLVMIntrinsic::setjmp:          NumArgs = 1; break;
   case LLVMIntrinsic::longjmp:         NumArgs = 2; break;