replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix SDISel lowering of zeroinitializer and undef to use ComputeValueVTs. 

This allows it to work correctly on nested aggregate values.
This fixes PR2625.

llvm-svn: 54330
This commit is contained in:
Dan Gohman 2008-08-04 23:30:41 +00:00
parent 8ef79ebd5f
commit 6e023e63cd
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
View File

@ -1184,34 +1184,18 @@ SDValue SelectionDAGLowering::getValue(const Value *V) {
return DAG.getMergeValues(&Constants[0], Constants.size());
}
if (const ArrayType *ATy = dyn_cast<ArrayType>(C->getType())) {
if (isa<StructType>(C->getType()) || isa<ArrayType>(C->getType())) {
assert((isa<ConstantAggregateZero>(C) || isa<UndefValue>(C)) &&
"Unknown array constant!");
unsigned NumElts = ATy->getNumElements();
if (NumElts == 0)
return SDValue(); // empty array
MVT EltVT = TLI.getValueType(ATy->getElementType());
SmallVector<SDValue, 4> Constants(NumElts);
for (unsigned i = 0, e = NumElts; i != e; ++i) {
if (isa<UndefValue>(C))
Constants[i] = DAG.getNode(ISD::UNDEF, EltVT);
else if (EltVT.isFloatingPoint())
Constants[i] = DAG.getConstantFP(0, EltVT);
else
Constants[i] = DAG.getConstant(0, EltVT);
}
return DAG.getMergeValues(&Constants[0], Constants.size());
}
"Unknown struct or array constant!");
if (const StructType *STy = dyn_cast<StructType>(C->getType())) {
assert((isa<ConstantAggregateZero>(C) || isa<UndefValue>(C)) &&
"Unknown struct constant!");
unsigned NumElts = STy->getNumElements();
SmallVector<MVT, 4> ValueVTs;
ComputeValueVTs(TLI, C->getType(), ValueVTs);
unsigned NumElts = ValueVTs.size();
if (NumElts == 0)
return SDValue(); // empty struct
SmallVector<SDValue, 4> Constants(NumElts);
for (unsigned i = 0, e = NumElts; i != e; ++i) {
MVT EltVT = TLI.getValueType(STy->getElementType(i));
for (unsigned i = 0; i != NumElts; ++i) {
MVT EltVT = ValueVTs[i];
if (isa<UndefValue>(C))
Constants[i] = DAG.getNode(ISD::UNDEF, EltVT);
else if (EltVT.isFloatingPoint())
@ -1219,7 +1203,7 @@ SDValue SelectionDAGLowering::getValue(const Value *V) {
else
Constants[i] = DAG.getConstant(0, EltVT);
}
return DAG.getMergeValues(&Constants[0], Constants.size());
return DAG.getMergeValues(&Constants[0], NumElts);
}
const VectorType *VecTy = cast<VectorType>(V->getType());

17
llvm/test/CodeGen/Generic/pr2625.ll Normal file
View File

@ -0,0 +1,17 @@
; RUN: llvm-as < %s | llc
; PR2625
define i32 @main({ i32, { i32 } }*) {
entry:
%state = alloca { i32, { i32 } }* ; <{ i32, { i32 } }**> [#uses=2]
store { i32, { i32 } }* %0, { i32, { i32 } }** %state
%retval = alloca i32 ; <i32*> [#uses=2]
store i32 0, i32* %retval
load { i32, { i32 } }** %state ; <{ i32, { i32 } }*>:1 [#uses=1]
store { i32, { i32 } } zeroinitializer, { i32, { i32 } }* %1
br label %return
return: ; preds = %entry
load i32* %retval ; <i32>:2 [#uses=1]
ret i32 %2
}