RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-04-03 08:11:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a bug in load expansion legalization and ret legalization. This fixes

Browse Source 
CodeGen/Generic/select.ll:castconst.

llvm-svn: 19357
This commit is contained in:
Chris Lattner 2005-01-07 22:28:47 +00:00
parent a834e96647
commit 79ca9cdb7e
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
View File

@ -72,6 +72,11 @@ class SelectionDAGLegalize {
/// more than once. /// more than once.
std::map<SDOperand, std::pair<SDOperand, SDOperand> > ExpandedNodes; std::map<SDOperand, std::pair<SDOperand, SDOperand> > ExpandedNodes;
void AddLegalizedOperand(SDOperand From, SDOperand To) {
bool isNew = LegalizedNodes.insert(std::make_pair(From, To)).second;
assert(isNew && "Got into the map somehow?");
}
/// setValueTypeAction - Set the action for a particular value type. This /// setValueTypeAction - Set the action for a particular value type. This
/// assumes an action has not already been set for this value type. /// assumes an action has not already been set for this value type.
void setValueTypeAction(MVT::ValueType VT, LegalizeAction A) { void setValueTypeAction(MVT::ValueType VT, LegalizeAction A) {
@ -323,7 +328,14 @@ SDOperand SelectionDAGLegalize::LegalizeOp(SDOperand Op) {
if (Tmp1 != Node->getOperand(0) || if (Tmp1 != Node->getOperand(0) ||
Tmp2 != Node->getOperand(1)) Tmp2 != Node->getOperand(1))
Result = DAG.getLoad(Node->getValueType(0), Tmp1, Tmp2); Result = DAG.getLoad(Node->getValueType(0), Tmp1, Tmp2);
break; else
Result = SDOperand(Node, 0);
// Since loads produce two values, make sure to remember that we legalized
// both of them.
AddLegalizedOperand(SDOperand(Node, 0), Result);
AddLegalizedOperand(SDOperand(Node, 1), Result.getValue(1));
return Result.getValue(Op.ResNo);
case ISD::EXTRACT_ELEMENT: case ISD::EXTRACT_ELEMENT:
// Get both the low and high parts. // Get both the low and high parts.
@ -368,7 +380,7 @@ SDOperand SelectionDAGLegalize::LegalizeOp(SDOperand Op) {
switch (getTypeAction(Node->getOperand(1).getValueType())) { switch (getTypeAction(Node->getOperand(1).getValueType())) {
case Legal: case Legal:
Tmp2 = LegalizeOp(Node->getOperand(1)); Tmp2 = LegalizeOp(Node->getOperand(1));
if (Tmp2 != Node->getOperand(1)) if (Tmp1 != Node->getOperand(0) || Tmp2 != Node->getOperand(1))
Result = DAG.getNode(ISD::RET, MVT::Other, Tmp1, Tmp2); Result = DAG.getNode(ISD::RET, MVT::Other, Tmp1, Tmp2);
break; break;
case Expand: { case Expand: {
@ -550,10 +562,8 @@ SDOperand SelectionDAGLegalize::LegalizeOp(SDOperand Op) {
break; break;
} }
if (!Op.Val->hasOneUse()) { if (!Op.Val->hasOneUse())
bool isNew = LegalizedNodes.insert(std::make_pair(Op, Result)).second; AddLegalizedOperand(Op, Result);
assert(isNew && "Got into the map somehow?");
}
return Result; return Result;
} }
@ -632,9 +642,7 @@ void SelectionDAGLegalize::ExpandOp(SDOperand Op, SDOperand &Lo, SDOperand &Hi){
Hi = DAG.getLoad(NVT, Lo.getValue(1), Ptr); Hi = DAG.getLoad(NVT, Lo.getValue(1), Ptr);
// Remember that we legalized the chain. // Remember that we legalized the chain.
bool isNew = LegalizedNodes.insert(std::make_pair(Op.getValue(1), AddLegalizedOperand(Op.getValue(1), Hi.getValue(1));
Hi.getValue(1))).second;
assert(isNew && "This node was already legalized!");
if (!TLI.isLittleEndian()) if (!TLI.isLittleEndian())
std::swap(Lo, Hi); std::swap(Lo, Hi);
break; break;