maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Re-apply 52002, allowing the verifier to accept non-MRV struct return 

types on functions, with adjustments so that it accepts both
new-style aggregate returns and old-style MRV returns, including those
with only a single member.

llvm-svn: 52157
This commit is contained in:
Dan Gohman 2008-06-09 21:26:13 +00:00
parent 6001b91d8e
commit 27ae953278
3 changed files with 56 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
llvm/lib/VMCore/Verifier.cpp
View File

@ -594,7 +594,10 @@ 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 (const StructType *STy = dyn_cast<StructType>(F->getReturnType())) {
else if (N == 1 && F->getReturnType() == RI.getOperand(0)->getType()) {
// Exactly one return value and it matches the return type. Good.
} else if (const StructType *STy = dyn_cast<StructType>(F->getReturnType())) {
// The return type is a struct; check for multiple return values.
Assert2(STy->getNumElements() == N,
"Incorrect number of return values in ret instruction!",
&RI, F->getReturnType());
@ -602,10 +605,18 @@ void Verifier::visitReturnInst(ReturnInst &RI) {
Assert2(STy->getElementType(i) == RI.getOperand(i)->getType(),
"Function return type does not match operand "
"type of return inst!", &RI, F->getReturnType());
} else if (const ArrayType *ATy = dyn_cast<ArrayType>(F->getReturnType())) {
// The return type is an array; check for multiple return values.
Assert2(ATy->getNumElements() == N,
"Incorrect number of return values in ret instruction!",
&RI, F->getReturnType());
for (unsigned i = 0; i != N; ++i)
Assert2(ATy->getElementType() == RI.getOperand(i)->getType(),
"Function return type does not match operand "
"type of return inst!", &RI, F->getReturnType());
} else {
Assert2(N == 1 && F->getReturnType() == RI.getOperand(0)->getType(),
"Function return type does not match operand "
"type of return inst!", &RI, F->getReturnType());
CheckFailed("Function return type does not match operand "
"type of return inst!", &RI, F->getReturnType());
}
// Check to make sure that the return value has necessary properties for

27
llvm/test/Assembler/aggregate-constant-values.ll Normal file
View File

@ -0,0 +1,27 @@
; RUN: llvm-as < %s | llvm-dis | grep 7 | count 3
define void @foo({i32, i32}* %x) nounwind {
store {i32, i32}{i32 7, i32 9}, {i32, i32}* %x
ret void
}
define void @foo_empty({}* %x) nounwind {
store {}{}, {}* %x
ret void
}
define void @bar([2 x i32]* %x) nounwind {
store [2 x i32][i32 7, i32 9], [2 x i32]* %x
ret void
}
define void @bar_empty([0 x i32]* %x) nounwind {
store [0 x i32][], [0 x i32]* %x
ret void
}
define void @qux(<{i32, i32}>* %x) nounwind {
store <{i32, i32}><{i32 7, i32 9}>, <{i32, i32}>* %x
ret void
}
define void @qux_empty(<{}>* %x) nounwind {
store <{}><{}>, <{}>* %x
ret void
}

14
llvm/test/Assembler/aggregate-return-single-value.ll Normal file
View File

@ -0,0 +1,14 @@
; RUN: llvm-as < %s | llvm-dis
define { i32 } @fooa() nounwind {
ret i32 0
}
define { i32 } @foob() nounwind {
ret {i32}{ i32 0 }
}
define [1 x i32] @fooc() nounwind {
ret i32 0
}
define [1 x i32] @food() nounwind {
ret [1 x i32][ i32 0 ]
}