diff options
| -rw-r--r-- | lib/CodeGen/SelectionDAG/LegalizeDAG.cpp | 21 | ||||
| -rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 7 |
2 files changed, 15 insertions, 13 deletions
diff --git a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp index 2f259b1eb4..e611557716 100644 --- a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp +++ b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp @@ -977,9 +977,13 @@ SDOperand SelectionDAGLegalize::LegalizeOp(SDOperand Op) { Tmp1 = LegalizeOp(Node->getOperand(0)); Tmp2 = LegalizeOp(Node->getOperand(1)); - if (Tmp1 != Node->getOperand(0) || Tmp2 != Node->getOperand(1)) - Result = DAG.getNode(ISD::READPORT, Node->getValueType(0), Tmp1, Tmp2); - else + if (Tmp1 != Node->getOperand(0) || Tmp2 != Node->getOperand(1)) { + std::vector<MVT::ValueType> VTs(Node->value_begin(), Node->value_end()); + std::vector<SDOperand> Ops; + Ops.push_back(Tmp1); + Ops.push_back(Tmp2); + Result = DAG.getNode(ISD::READPORT, VTs, Ops); + } else Result = SDOperand(Node, 0); // Since these produce two values, make sure to remember that we legalized // both of them. @@ -1003,10 +1007,13 @@ SDOperand SelectionDAGLegalize::LegalizeOp(SDOperand Op) { case TargetLowering::Custom: default: assert(0 && "This action not implemented for this operation!"); case TargetLowering::Legal: - if (Tmp1 != Node->getOperand(0) || Tmp2 != Node->getOperand(1)) - Result = DAG.getNode(Node->getOpcode(), Node->getValueType(0), - Tmp1, Tmp2); - else + if (Tmp1 != Node->getOperand(0) || Tmp2 != Node->getOperand(1)) { + std::vector<MVT::ValueType> VTs(Node->value_begin(), Node->value_end()); + std::vector<SDOperand> Ops; + Ops.push_back(Tmp1); + Ops.push_back(Tmp2); + Result = DAG.getNode(ISD::READPORT, VTs, Ops); + } else Result = SDOperand(Node, 0); break; case TargetLowering::Expand: diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index bfaca1de14..c3889dd7ff 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -1215,12 +1215,7 @@ SDOperand SelectionDAG::getNode(unsigned Opcode, MVT::ValueType VT, N = new SDNode(Opcode, N1, N2); } - - if (Opcode != ISD::READPORT && Opcode != ISD::READIO) - N->setValueTypes(VT); - else - N->setValueTypes(VT, MVT::Other); - + N->setValueTypes(VT); AllNodes.push_back(N); return SDOperand(N, 0); } |