RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-11-24 20:29:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove some support for ReturnInsts with multiple operands, and for

Browse Source 
returning a scalar value in a function whose return type is a single-
element structure or array.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@128810 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jay Foad 2011-04-04 07:44:02 +00:00
parent cc5d992bc1
commit 3e2f74e6d6
4 changed files with 5 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Target/CBackend/CBackend.cpp
View File

@ -2440,24 +2440,6 @@ void CWriter::visitReturnInst(ReturnInst &I) {
return;
}
if (I.getNumOperands() > 1) {
Out << " {\n";
Out << " ";
printType(Out, I.getParent()->getParent()->getReturnType());
Out << " llvm_cbe_mrv_temp = {\n";
for (unsigned i = 0, e = I.getNumOperands(); i != e; ++i) {
Out << " ";
writeOperand(I.getOperand(i));
if (i != e - 1)
Out << ",";
Out << "\n";
}
Out << " };\n";
Out << " return llvm_cbe_mrv_temp;\n";
Out << " }\n";
return;
}
Out << " return";
if (I.getNumOperands()) {
Out << ' ';

2
lib/Transforms/IPO/IPConstantPropagation.cpp
View File

@ -186,7 +186,7 @@ bool IPCP::PropagateConstantReturn(Function &F) {
// Find the returned value
Value *V;
if (!STy)
V = RI->getOperand(i);
V = RI->getOperand(0);
else
V = FindInsertedValue(RI->getOperand(0), i);

28
lib/VMCore/Verifier.cpp
View File

@ -826,30 +826,10 @@ void Verifier::visitReturnInst(ReturnInst &RI) {
Assert2(N == 0,
"Found return instr that returns non-void in Function of void "
"return type!", &RI, 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());
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 (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 {
CheckFailed("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());
// Check to make sure that the return value has necessary properties for
// terminators...

6
test/Assembler/aggregate-return-single-value.ll
View File

@ -1,14 +1,8 @@
; 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 ]
}