diff options
| -rw-r--r-- | lib/VMCore/Verifier.cpp | 5 | ||||
| -rw-r--r-- | test/Assembler/AggregrateReturn.ll | 22 |
2 files changed, 1 insertions, 26 deletions
diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp index 8cbb703a73..bfa2e6573f 100644 --- a/lib/VMCore/Verifier.cpp +++ b/lib/VMCore/Verifier.cpp @@ -594,10 +594,7 @@ void Verifier::visitReturnInst(ReturnInst &RI) { Assert2(N == 0, "Found return instr that returns void in Function of non-void " "return type!", &RI, F->getReturnType()); - else if (N > 1) { - const StructType *STy = dyn_cast<StructType>(F->getReturnType()); - Assert2(STy, "Return instr with multiple values, but return type is not " - "a struct", &RI, F->getReturnType()); + else if (const StructType *STy = dyn_cast<StructType>(F->getReturnType())) { Assert2(STy->getNumElements() == N, "Incorrect number of return values in ret instruction!", &RI, F->getReturnType()); diff --git a/test/Assembler/AggregrateReturn.ll b/test/Assembler/AggregrateReturn.ll deleted file mode 100644 index 264b34323e..0000000000 --- a/test/Assembler/AggregrateReturn.ll +++ /dev/null @@ -1,22 +0,0 @@ -; RUN: llvm-as < %s | llvm-dis - -define { i32, i32 } @foo() { - %res = insertvalue { i32, i32 } undef, i32 0, 0 - %res2 = insertvalue { i32, i32 } %res, i32 1, 1 - ret { i32, i32 } %res2 -} - -define [ 2 x i32 ] @bar() { - %res = insertvalue [ 2 x i32 ] undef, i32 0, 0 - %res2 = insertvalue [ 2 x i32 ] %res, i32 1, 1 - ret [ 2 x i32 ] %res2 -} - -define i32 @main() { - %a = call { i32, i32 }()* @foo () - %b = call [ 2 x i32 ]()* @bar () - %a.0 = extractvalue { i32, i32 } %a, 0 - %b.1 = extractvalue [ 2 x i32 ] %b, 1 - %r = add i32 %a.0, %b.1 - ret i32 %r -} |