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

[Misha Brukman]

Changes in directory llvm/lib/VMCore:

Function.cpp updated: 1.62 -> 1.62.2.1
IntrinsicLowering.cpp updated: 1.5 -> 1.5.2.1
Verifier.cpp updated: 1.78 -> 1.78.2.1

---
Log message:

Add support for the "join" intrinsic:
* lowered to abort()
* currently takes no parameters, in the future will take as parameter a token
  generated by the corresponding pbr.


---
Diffs of the changes:  (+11 -0)

Index: llvm/lib/VMCore/Function.cpp
diff -u llvm/lib/VMCore/Function.cpp:1.62 llvm/lib/VMCore/Function.cpp:1.62.2.1
--- llvm/lib/VMCore/Function.cpp:1.62	Sat Jan 10 15:42:24 2004
+++ llvm/lib/VMCore/Function.cpp	Mon Feb  2 16:33:06 2004
@@ -214,6 +214,9 @@
     if (getName() == "llvm.dbg.func.start")  return Intrinsic::dbg_func_start;
     if (getName() == "llvm.dbg.declare")     return Intrinsic::dbg_declare;
     break;
+  case 'j':
+    if (getName() == "llvm.join")  return Intrinsic::join;
+    break;
   case 'l':
     if (getName() == "llvm.longjmp")  return Intrinsic::longjmp;
     break;


Index: llvm/lib/VMCore/IntrinsicLowering.cpp
diff -u llvm/lib/VMCore/IntrinsicLowering.cpp:1.5 llvm/lib/VMCore/IntrinsicLowering.cpp:1.5.2.1
--- llvm/lib/VMCore/IntrinsicLowering.cpp:1.5	Wed Jan 14 14:41:29 2004
+++ llvm/lib/VMCore/IntrinsicLowering.cpp	Mon Feb  2 16:33:06 2004
@@ -57,6 +57,11 @@
     if (CI->getType() != Type::VoidTy)
       CI->replaceAllUsesWith(Constant::getNullValue(CI->getType()));
     break;    // Simply strip out debugging intrinsics
+
+  case Intrinsic::join: 
+    // Insert the call to abort
+    new CallInst(M->getOrInsertFunction("abort", Type::VoidTy, 0), "", CI);
+    break;    
   }
 
   assert(CI->use_empty() &&


Index: llvm/lib/VMCore/Verifier.cpp
diff -u llvm/lib/VMCore/Verifier.cpp:1.78 llvm/lib/VMCore/Verifier.cpp:1.78.2.1
--- llvm/lib/VMCore/Verifier.cpp:1.78	Tue Jan 13 23:42:52 2004
+++ llvm/lib/VMCore/Verifier.cpp	Mon Feb  2 16:33:06 2004
@@ -561,6 +561,9 @@
   case Intrinsic::dbg_region_end:  NumArgs = 1; break;
   case Intrinsic::dbg_func_start:  NumArgs = 1; break;
   case Intrinsic::dbg_declare:     NumArgs = 1; break;
+
+  // FIXME: this should take a single parameter which is returned by pbr
+  case Intrinsic::join:            NumArgs = 0; break;
  
   case Intrinsic::alpha_ctlz:      NumArgs = 1; break;
   case Intrinsic::alpha_cttz:      NumArgs = 1; break;