Make 64bit args and float args work correct with calls. Thanks to Chris

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

diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp
index e90f5b3face950415ad3855cb3e1f52798a56489..89fd98081fa54387363792ca53fbd0e007de95a1 100644 (file)
--- a/lib/VMCore/Verifier.cpp
+++ b/lib/VMCore/Verifier.cpp
@@ -78,17 +78,17 @@ namespace {  // Anonymous namespace for class
 
     Verifier() 
         : Broken(false), RealPass(true), action(AbortProcessAction),
-          DS(0), msgs( std::ios_base::app | std::ios_base::out ) {}
+          DS(0), msgs( std::ios::app | std::ios::out ) {}
     Verifier( VerifierFailureAction ctn )
         : Broken(false), RealPass(true), action(ctn), DS(0), 
-          msgs( std::ios_base::app | std::ios_base::out ) {}
+          msgs( std::ios::app | std::ios::out ) {}
     Verifier(bool AB ) 
         : Broken(false), RealPass(true), 
           action( AB ? AbortProcessAction : PrintMessageAction), DS(0), 
-          msgs( std::ios_base::app | std::ios_base::out ) {}
+          msgs( std::ios::app | std::ios::out ) {}
     Verifier(DominatorSet &ds) 
       : Broken(false), RealPass(false), action(PrintMessageAction),
-        DS(&ds), msgs( std::ios_base::app | std::ios_base::out ) {}
+        DS(&ds), msgs( std::ios::app | std::ios::out ) {}
 
 
     bool doInitialization(Module &M) {
@@ -127,8 +127,8 @@ namespace {  // Anonymous namespace for class
         if (I->isExternal()) visitFunction(*I);
       }
 
-      for (Module::giterator I = M.gbegin(), E = M.gend(); I != E; ++I)
-        visitGlobalValue(*I);
+      for (Module::global_iterator I = M.global_begin(), E = M.global_end(); I != E; ++I)
+        visitGlobalVariable(*I);
 
       // If the module is broken, abort at this time.
       abortIfBroken();
@@ -171,6 +171,7 @@ namespace {  // Anonymous namespace for class
     // Verification methods...
     void verifySymbolTable(SymbolTable &ST);
     void visitGlobalValue(GlobalValue &GV);
+    void visitGlobalVariable(GlobalVariable &GV);
     void visitFunction(Function &F);
     void visitBasicBlock(BasicBlock &BB);
     void visitPHINode(PHINode &PN);
@@ -262,6 +263,16 @@ void Verifier::visitGlobalValue(GlobalValue &GV) {
   }
 }
 
+void Verifier::visitGlobalVariable(GlobalVariable &GV) {
+  if (GV.hasInitializer()) 
+    Assert1(GV.getInitializer()->getType() == GV.getType()->getElementType(),
+            "Global variable initializer type does not match global "
+            "variable type!", &GV);
+  
+  visitGlobalValue(GV);
+}
+
+
 // verifySymbolTable - Verify that a function or module symbol table is ok
 //
 void Verifier::verifySymbolTable(SymbolTable &ST) {
@@ -296,7 +307,7 @@ void Verifier::visitFunction(Function &F) {
 
   // Check that the argument values match the function type for this function...
   unsigned i = 0;
-  for (Function::aiterator I = F.abegin(), E = F.aend(); I != E; ++I, ++i) {
+  for (Function::arg_iterator I = F.arg_begin(), E = F.arg_end(); I != E; ++I, ++i) {
     Assert2(I->getType() == FT->getParamType(i),
             "Argument value does not match function argument type!",
             I, FT->getParamType(i));
@@ -321,6 +332,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 +378,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 +390,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 +421,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);
 }
 
 
@@ -580,6 +592,7 @@ void Verifier::visitInstruction(Instruction &I) {
   for (unsigned i = 0, e = I.getNumOperands(); i != e; ++i) {
     // Check to make sure that the "address of" an intrinsic function is never
     // taken.
+    Assert1(I.getOperand(i) != 0, "Instruction has null operand!", &I);
     if (Function *F = dyn_cast<Function>(I.getOperand(i))) {
       Assert1(!F->isIntrinsic() || (i == 0 && isa<CallInst>(I)),
               "Cannot take the address of an intrinsic!", &I);
@@ -734,23 +747,9 @@ void Verifier::visitIntrinsicFunctionCall(Intrinsic::ID ID, CallInst &CI) {
   case Intrinsic::memcpy:          NumArgs = 4; break;
   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::prefetch:        NumArgs = 3; break;
+ 
   case Intrinsic::not_intrinsic: 
     assert(0 && "Invalid intrinsic!"); NumArgs = 0; break;
   }