simplify MorphNodeTo to take a VTList operand.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@33868 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index 0370cc1..f790e63 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -2085,8 +2085,7 @@
RemoveNodeFromCSEMaps(N);
- N->MorphNodeTo(ISD::BUILTIN_OP_END+TargetOpc);
- N->setValueTypes(VTs);
+ N->MorphNodeTo(ISD::BUILTIN_OP_END+TargetOpc, VTs);
CSEMap.InsertNode(N, IP);
return N;
@@ -2105,8 +2104,7 @@
RemoveNodeFromCSEMaps(N);
SDOperand OperandList[] = { Op1 };
- N->MorphNodeTo(ISD::BUILTIN_OP_END+TargetOpc);
- N->setValueTypes(VTs);
+ N->MorphNodeTo(ISD::BUILTIN_OP_END+TargetOpc, VTs);
N->setOperands(OperandList, 1);
CSEMap.InsertNode(N, IP);
return N;
@@ -2127,8 +2125,7 @@
SDOperand OperandList[] = { Op1, Op2 };
- N->MorphNodeTo(ISD::BUILTIN_OP_END+TargetOpc);
- N->setValueTypes(VTs);
+ N->MorphNodeTo(ISD::BUILTIN_OP_END+TargetOpc, VTs);
N->setOperands(OperandList, 2);
CSEMap.InsertNode(N, IP); // Memoize the new node.
@@ -2149,8 +2146,7 @@
RemoveNodeFromCSEMaps(N);
SDOperand OperandList[] = { Op1, Op2, Op3 };
- N->MorphNodeTo(ISD::BUILTIN_OP_END+TargetOpc);
- N->setValueTypes(VTs);
+ N->MorphNodeTo(ISD::BUILTIN_OP_END+TargetOpc, VTs);
N->setOperands(OperandList, 3);
CSEMap.InsertNode(N, IP); // Memoize the new node.
@@ -2169,8 +2165,7 @@
return ON;
RemoveNodeFromCSEMaps(N);
- N->MorphNodeTo(ISD::BUILTIN_OP_END+TargetOpc);
- N->setValueTypes(VTs);
+ N->MorphNodeTo(ISD::BUILTIN_OP_END+TargetOpc, VTs);
N->setOperands(Ops, NumOps);
CSEMap.InsertNode(N, IP); // Memoize the new node.
@@ -2190,8 +2185,7 @@
RemoveNodeFromCSEMaps(N);
SDOperand OperandList[] = { Op1, Op2 };
- N->MorphNodeTo(ISD::BUILTIN_OP_END+TargetOpc);
- N->setValueTypes(VTs);
+ N->MorphNodeTo(ISD::BUILTIN_OP_END+TargetOpc, VTs);
N->setOperands(OperandList, 2);
CSEMap.InsertNode(N, IP); // Memoize the new node.
@@ -2213,8 +2207,7 @@
RemoveNodeFromCSEMaps(N);
SDOperand OperandList[] = { Op1, Op2, Op3 };
- N->MorphNodeTo(ISD::BUILTIN_OP_END+TargetOpc);
- N->setValueTypes(VTs);
+ N->MorphNodeTo(ISD::BUILTIN_OP_END+TargetOpc, VTs);
N->setOperands(OperandList, 3);
CSEMap.InsertNode(N, IP); // Memoize the new node.
@@ -2547,6 +2540,12 @@
void LoadSDNode::ANCHOR() {}
void StoreSDNode::ANCHOR() {}
+HandleSDNode::~HandleSDNode() {
+ SDVTList VTs = { 0, 0 };
+ MorphNodeTo(ISD::HANDLENODE, VTs); // Drops operand uses.
+}
+
+
/// Profile - Gather unique data for the node.
///
void SDNode::Profile(FoldingSetNodeID &ID) {