mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-24 11:42:57 +01:00
Use a legal type for elements of the vector_shuffle
mask. These are just indices into the shuffled vector so their type is unrelated to the type of the shuffled elements (which is what was being used before). This fixes vec_shuffle-11.ll when using LegalizeTypes. What seems to have happened is that Dan's recent change r53687, which corrected the result type of the shuffle, somehow caused LegalizeTypes to notice that the mask operand was a BUILD_VECTOR with a legal type but elements of an illegal type (i64). LegalizeTypes legalized this by introducing a new BUILD_VECTOR of i32 and bitcasting it to the old type. But the mask operand is not supposed to be a bitcast but a straight BUILD_VECTOR of constants, causing a crash. llvm-svn: 53729
This commit is contained in:
parent
8981962672
commit
08ea7c0351
@ -5046,9 +5046,9 @@ SDOperand DAGCombiner::XformToShuffleWithZero(SDNode *N) {
|
|||||||
if (!isa<ConstantSDNode>(Elt))
|
if (!isa<ConstantSDNode>(Elt))
|
||||||
return SDOperand();
|
return SDOperand();
|
||||||
else if (cast<ConstantSDNode>(Elt)->isAllOnesValue())
|
else if (cast<ConstantSDNode>(Elt)->isAllOnesValue())
|
||||||
IdxOps.push_back(DAG.getConstant(i, EVT));
|
IdxOps.push_back(DAG.getConstant(i, TLI.getPointerTy()));
|
||||||
else if (cast<ConstantSDNode>(Elt)->isNullValue())
|
else if (cast<ConstantSDNode>(Elt)->isNullValue())
|
||||||
IdxOps.push_back(DAG.getConstant(NumElts, EVT));
|
IdxOps.push_back(DAG.getConstant(NumElts, TLI.getPointerTy()));
|
||||||
else
|
else
|
||||||
return SDOperand();
|
return SDOperand();
|
||||||
}
|
}
|
||||||
@ -5066,7 +5066,8 @@ SDOperand DAGCombiner::XformToShuffleWithZero(SDNode *N) {
|
|||||||
std::vector<SDOperand> ZeroOps(NumElts, DAG.getConstant(0, EVT));
|
std::vector<SDOperand> ZeroOps(NumElts, DAG.getConstant(0, EVT));
|
||||||
Ops.push_back(DAG.getNode(ISD::BUILD_VECTOR, VT,
|
Ops.push_back(DAG.getNode(ISD::BUILD_VECTOR, VT,
|
||||||
&ZeroOps[0], ZeroOps.size()));
|
&ZeroOps[0], ZeroOps.size()));
|
||||||
Ops.push_back(DAG.getNode(ISD::BUILD_VECTOR, VT,
|
Ops.push_back(DAG.getNode(ISD::BUILD_VECTOR,
|
||||||
|
MVT::getVectorVT(TLI.getPointerTy(), NumElts),
|
||||||
&IdxOps[0], IdxOps.size()));
|
&IdxOps[0], IdxOps.size()));
|
||||||
SDOperand Result = DAG.getNode(ISD::VECTOR_SHUFFLE, VT,
|
SDOperand Result = DAG.getNode(ISD::VECTOR_SHUFFLE, VT,
|
||||||
&Ops[0], Ops.size());
|
&Ops[0], Ops.size());
|
||||||
|
Loading…
Reference in New Issue
Block a user