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

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

llvm-svn: 8145

3 files changed, 0 insertions, 10 deletions

diff --git a/llvm/include/llvm/Intrinsics.h b/llvm/include/llvm/Intrinsics.h
index 6c7f6c534a6..6445eff6be7 100644
--- a/llvm/include/llvm/Intrinsics.h
+++ b/llvm/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/llvm/lib/VMCore/Function.cpp b/llvm/lib/VMCore/Function.cpp
index ce190c80a3f..ccbe4c22448 100644
--- a/llvm/lib/VMCore/Function.cpp
+++ b/llvm/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/llvm/lib/VMCore/Verifier.cpp b/llvm/lib/VMCore/Verifier.cpp
index 23ad6421bb3..138542c06fb 100644
--- a/llvm/lib/VMCore/Verifier.cpp
+++ b/llvm/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;