From 6c63f62729fbd7cdf66f96ad52ea1bba62851311 Mon Sep 17 00:00:00 2001
From: Bill Wendling <isanbard@gmail.com>
Date: Fri, 21 Nov 2008 02:22:59 +0000
Subject: [PATCH] Remove chains. Unnecessary.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@59783 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/CodeGen/SelectionDAG/DAGCombiner.cpp       | 10 ++++------
 lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp | 12 ++++--------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
index e2aad48a2c3..7074c5980e6 100644
--- a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -5148,7 +5148,6 @@ SDValue DAGCombiner::visitVECTOR_SHUFFLE(SDNode *N) {
 }
 
 SDValue DAGCombiner::visitSADDO(SDNode *N) {
-  SDValue Chain = N->getOperand(2);
   SDValue LHS = N->getOperand(0);
   SDValue RHS = N->getOperand(1);
 
@@ -5157,17 +5156,16 @@ SDValue DAGCombiner::visitSADDO(SDNode *N) {
   SDValue Cmp = DAG.getSetCC(MVT::i1, Sum, LHS, ISD::SETLT);
   AddToWorkList(Cmp.getNode());
 
-  MVT ValueVTs[] = { LHS.getValueType(), MVT::i1, MVT::Other };
-  SDValue Ops[] = { Sum, Cmp, Chain };
+  MVT ValueVTs[] = { LHS.getValueType(), MVT::i1 };
+  SDValue Ops[] = { Sum, Cmp };
 
-  SDValue Merge = DAG.getMergeValues(DAG.getVTList(&ValueVTs[0], 3),
-                                     &Ops[0], 3);
+  SDValue Merge = DAG.getMergeValues(DAG.getVTList(&ValueVTs[0], 2),
+                                     &Ops[0], 2);
   SDNode *MNode = Merge.getNode();
 
   AddToWorkList(MNode);
   DAG.ReplaceAllUsesOfValueWith(SDValue(N, 0), SDValue(MNode, 0));
   DAG.ReplaceAllUsesOfValueWith(SDValue(N, 1), SDValue(MNode, 1));
-  DAG.ReplaceAllUsesOfValueWith(SDValue(N, 2), SDValue(MNode, 2));
 
   // Since the node is now dead, remove it from the graph.
   removeFromWorkList(N);
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
index 75910ef00d0..4bc0128bd57 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
@@ -4095,21 +4095,17 @@ SelectionDAGLowering::visitIntrinsicCall(CallInst &I, unsigned Intrinsic) {
 
   case Intrinsic::sadd_with_overflow: {
     // Convert to "ISD::SADDO" instruction.
-    SDValue Chain = getRoot();
     SDValue Op1 = getValue(I.getOperand(1));
     SDValue Op2 = getValue(I.getOperand(2));
     MVT Ty = Op1.getValueType();
 
-    MVT ValueVTs[] = { Ty, MVT::i1, MVT::Other };
-    SDValue Ops[] = { Op1, Op2, Chain };
+    MVT ValueVTs[] = { Ty, MVT::i1 };
+    SDValue Ops[] = { Op1, Op2 };
 
-    SDValue Result = DAG.getNode(ISD::SADDO, DAG.getVTList(&ValueVTs[0], 3),
-                                 &Ops[0], 3);
+    SDValue Result = DAG.getNode(ISD::SADDO, DAG.getVTList(&ValueVTs[0], 2),
+                                 &Ops[0], 2);
 
     setValue(&I, Result);
-
-    unsigned NumArgRegs = Result.getNode()->getNumValues() - 1;
-    DAG.setRoot(SDValue(Result.getNode(), NumArgRegs));
     return 0;
   }
   case Intrinsic::uadd_with_overflow: {