The noreturn GCC extension is now supported.

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

diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp
index e90f5b3face950415ad3855cb3e1f52798a56489..4653ef89551f5941bc27707adf6fad93aadc4567 100644 (file)
--- a/lib/VMCore/Verifier.cpp
+++ b/lib/VMCore/Verifier.cpp
@@ -321,6 +321,9 @@ void Verifier::visitFunction(Function &F) {
 void Verifier::visitBasicBlock(BasicBlock &BB) {
   InstsInThisBlock.clear();
 
+  // Ensure that basic blocks have terminators!
+  Assert1(BB.getTerminator(), "Basic Block does not have terminator!", &BB);
+
   // Check constraints that this basic block imposes on all of the PHI nodes in
   // it.
   if (isa<PHINode>(BB.front())) {
@@ -364,9 +367,6 @@ void Verifier::visitBasicBlock(BasicBlock &BB) {
       }
     }
   }
-
-  // Ensure that basic blocks have terminators!
-  Assert1(BB.getTerminator(), "Basic Block does not have terminator!", &BB);
 }
 
 void Verifier::visitTerminatorInst(TerminatorInst &I) {
@@ -379,9 +379,9 @@ void Verifier::visitTerminatorInst(TerminatorInst &I) {
 void Verifier::visitReturnInst(ReturnInst &RI) {
   Function *F = RI.getParent()->getParent();
   if (RI.getNumOperands() == 0)
-    Assert1(F->getReturnType() == Type::VoidTy,
-            "Function returns no value, but ret instruction found that does!",
-            &RI);
+    Assert2(F->getReturnType() == Type::VoidTy,
+            "Found return instr that returns void in Function of non-void "
+            "return type!", &RI, F->getReturnType());
   else
     Assert2(F->getReturnType() == RI.getOperand(0)->getType(),
             "Function return type does not match operand "
@@ -410,6 +410,7 @@ void Verifier::visitSelectInst(SelectInst &SI) {
           "Select values must have identical types!", &SI);
   Assert1(SI.getTrueValue()->getType() == SI.getType(),
           "Select values must have same type as select instruction!", &SI);
+  visitInstruction(SI);
 }
 
 
@@ -735,22 +736,6 @@ void Verifier::visitIntrinsicFunctionCall(Intrinsic::ID ID, CallInst &CI) {
   case Intrinsic::memmove:         NumArgs = 4; break;
   case Intrinsic::memset:          NumArgs = 4; break;
  
-  case Intrinsic::alpha_ctlz:      NumArgs = 1; break;
-  case Intrinsic::alpha_cttz:      NumArgs = 1; break;
-  case Intrinsic::alpha_ctpop:     NumArgs = 1; break;
-  case Intrinsic::alpha_umulh:     NumArgs = 2; break;
-  case Intrinsic::alpha_vecop:     NumArgs = 4; break;
-  case Intrinsic::alpha_pup:       NumArgs = 3; break;
-  case Intrinsic::alpha_bytezap:   NumArgs = 2; break;
-  case Intrinsic::alpha_bytemanip: NumArgs = 3; break;
-  case Intrinsic::alpha_dfpbop:    NumArgs = 3; break;
-  case Intrinsic::alpha_dfpuop:    NumArgs = 2; break;
-  case Intrinsic::alpha_unordered: NumArgs = 2; break;
-  case Intrinsic::alpha_uqtodfp:   NumArgs = 2; break;
-  case Intrinsic::alpha_uqtosfp:   NumArgs = 2; break;
-  case Intrinsic::alpha_dfptosq:   NumArgs = 2; break;
-  case Intrinsic::alpha_sfptosq:   NumArgs = 2; break;
-
   case Intrinsic::not_intrinsic: 
     assert(0 && "Invalid intrinsic!"); NumArgs = 0; break;
   }