diff options
| -rw-r--r-- | lib/VMCore/Verifier.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp index 8a1b86f763..a0d7d0fe65 100644 --- a/lib/VMCore/Verifier.cpp +++ b/lib/VMCore/Verifier.cpp @@ -592,22 +592,23 @@ void Verifier::visitTerminatorInst(TerminatorInst &I) { void Verifier::visitReturnInst(ReturnInst &RI) { Function *F = RI.getParent()->getParent(); unsigned N = RI.getNumOperands(); - if (N == 0) - Assert2(F->getReturnType() == Type::VoidTy, + if (F->getReturnType() == Type::VoidTy) + Assert2(N == 0, "Found return instr that returns void in Function of non-void " "return type!", &RI, F->getReturnType()); else if (const StructType *STy = dyn_cast<StructType>(F->getReturnType())) { - for (unsigned i = 0; i < N; i++) + Assert2(STy->getNumElements() == N, + "Incorrect number of return values in ret instruction!", + &RI, F->getReturnType()); + for (unsigned i = 0; i != N; ++i) Assert2(STy->getElementType(i) == RI.getOperand(i)->getType(), "Function return type does not match operand " "type of return inst!", &RI, F->getReturnType()); - } - else if (N == 1) - Assert2(F->getReturnType() == RI.getOperand(0)->getType(), + } else { + Assert2(N == 1 && F->getReturnType() == RI.getOperand(0)->getType(), "Function return type does not match operand " "type of return inst!", &RI, F->getReturnType()); - else - Assert1(0, "Invalid return type!", &RI); + } // Check to make sure that the return value has necessary properties for // terminators... |