remove special case hacks for readport/readio from the binary operator

codepath

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@22019 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
index 2f259b1eb4855946d65747386d6f6c47d31241ef..e611557716d4384c6752c9e1d29e89c2484ff0ee 100644 (file)
--- 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 bfaca1de144edfb794feae10e869b22d8f71a52f..c3889dd7ff81f6e15c8495abba46d52c5a1df3c1 100644 (file)
--- 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);
 }