Noting and enforcing that GC intrinsics are valid only within a

[oota-llvm.git] / lib / VMCore / Verifier.cpp

diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp
index e6495a01089ba85897e26e0f71027f7b9617fdad..df0cb997bbfccb8138c4b77e8dad17278b5edcac 100644 (file)
--- a/lib/VMCore/Verifier.cpp
+++ b/lib/VMCore/Verifier.cpp
@@ -1167,37 +1167,45 @@ void Verifier::visitIntrinsicFunctionCall(Intrinsic::ID ID, CallInst &CI) {
   switch (ID) {
   default:
     break;
-  case Intrinsic::gcroot: {
-      Type *PtrTy    = PointerType::getUnqual(Type::Int8Ty),
-           *PtrPtrTy = PointerType::getUnqual(PtrTy);
-      Assert1(CI.getOperand(1)->getType() == PtrPtrTy,
-              "Intrinsic parameter #1 is not i8**.", &CI);
-      Assert1(CI.getOperand(2)->getType() == PtrTy,
-              "Intrinsic parameter #2 is not i8*.", &CI);
-      Assert1(
-            isa<AllocaInst>(IntrinsicInst::StripPointerCasts(CI.getOperand(1))),
-            "llvm.gcroot parameter #1 must be an alloca.",
-              &CI);
-      Assert1(isa<Constant>(CI.getOperand(2)),
-              "llvm.gcroot parameter #2 must be a constant.", &CI);
-    } break;
-  case Intrinsic::gcwrite: {
-      Type *PtrTy    = PointerType::getUnqual(Type::Int8Ty),
-           *PtrPtrTy = PointerType::getUnqual(PtrTy);
-      Assert1(CI.getOperand(1)->getType() == PtrTy,
-              "Intrinsic parameter #1 is not a i8*.", &CI);
-      Assert1(CI.getOperand(2)->getType() == PtrTy,
-              "Intrinsic parameter #2 is not a i8*.", &CI);
-      Assert1(CI.getOperand(3)->getType() == PtrPtrTy,
-              "Intrinsic parameter #3 is not a i8**.", &CI);
-    } break;
+  case Intrinsic::gcroot:
+  case Intrinsic::gcwrite:
   case Intrinsic::gcread: {
       Type *PtrTy    = PointerType::getUnqual(Type::Int8Ty),
            *PtrPtrTy = PointerType::getUnqual(PtrTy);
-      Assert1(CI.getOperand(1)->getType() == PtrTy,
-              "Intrinsic parameter #1 is not a i8*.", &CI);
-      Assert1(CI.getOperand(2)->getType() == PtrPtrTy,
-              "Intrinsic parameter #2 is not a i8**.", &CI);
+      
+      switch (ID) {
+      default:
+        break;
+      case Intrinsic::gcroot:
+        Assert1(CI.getOperand(1)->getType() == PtrPtrTy,
+                "Intrinsic parameter #1 is not i8**.", &CI);
+        Assert1(CI.getOperand(2)->getType() == PtrTy,
+                "Intrinsic parameter #2 is not i8*.", &CI);
+        Assert1(isa<AllocaInst>(
+                  IntrinsicInst::StripPointerCasts(CI.getOperand(1))),
+                "llvm.gcroot parameter #1 must be an alloca.", &CI);
+        Assert1(isa<Constant>(CI.getOperand(2)),
+                "llvm.gcroot parameter #2 must be a constant.", &CI);
+        break;
+      case Intrinsic::gcwrite:
+        Assert1(CI.getOperand(1)->getType() == PtrTy,
+                "Intrinsic parameter #1 is not a i8*.", &CI);
+        Assert1(CI.getOperand(2)->getType() == PtrTy,
+                "Intrinsic parameter #2 is not a i8*.", &CI);
+        Assert1(CI.getOperand(3)->getType() == PtrPtrTy,
+                "Intrinsic parameter #3 is not a i8**.", &CI);
+        break;
+      case Intrinsic::gcread:
+        Assert1(CI.getOperand(1)->getType() == PtrTy,
+                "Intrinsic parameter #1 is not a i8*.", &CI);
+        Assert1(CI.getOperand(2)->getType() == PtrPtrTy,
+                "Intrinsic parameter #2 is not a i8**.", &CI);
+        break;
+      }
+      
+      Assert1(CI.getParent()->getParent()->hasCollector(),
+              "Enclosing function does not specify a collector algorithm.",
+              &CI);
     } break;
   case Intrinsic::init_trampoline:
     Assert1(isa<Function>(IntrinsicInst::StripPointerCasts(CI.getOperand(2))),