[llvm-commits] CVS: llvm/lib/VMCore/Function.cpp Verifier.cpp

[Chris Lattner]

Changes in directory llvm/lib/VMCore:

Function.cpp updated: 1.44 -> 1.45
Verifier.cpp updated: 1.56 -> 1.57

---
Log message:

rethrow is really the language independent primitive here.  "throw" can be written
in terms of it and llvm.exc.setcurrent.

Rework the intrinsics.


---
Diffs of the changes:

Index: llvm/lib/VMCore/Function.cpp
diff -u llvm/lib/VMCore/Function.cpp:1.44 llvm/lib/VMCore/Function.cpp:1.45
--- llvm/lib/VMCore/Function.cpp:1.44	Sun Aug 24 01:57:53 2003
+++ llvm/lib/VMCore/Function.cpp	Sun Aug 24 07:24:08 2003
@@ -197,8 +197,7 @@
     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;
@@ -207,6 +206,9 @@
     if (getName() == "llvm.setjmp")     return LLVMIntrinsic::setjmp;
     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;


Index: llvm/lib/VMCore/Verifier.cpp
diff -u llvm/lib/VMCore/Verifier.cpp:1.56 llvm/lib/VMCore/Verifier.cpp:1.57
--- llvm/lib/VMCore/Verifier.cpp:1.56	Sun Aug 24 00:30:29 2003
+++ llvm/lib/VMCore/Verifier.cpp	Sun Aug 24 07:24:08 2003
@@ -522,8 +522,8 @@
   case LLVMIntrinsic::va_end:          NumArgs = 1; break;
   case LLVMIntrinsic::va_copy:         NumArgs = 2; break;
 
-  case LLVMIntrinsic::exc_throw:       NumArgs = 1; break;
-  case LLVMIntrinsic::exc_rethrow:     NumArgs = 0; 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;