From: Chris Lattner <sabre@nondot.org>
Date: Mon, 1 Mar 2010 22:51:11 +0000 (+0000)
Subject: remove a little hack I did for the old isel, not needed
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=e60f7b4412409f2ba641dd85c3aa1d06e005380d;p=oota-llvm.git

remove a little hack I did for the old isel, not needed
now that it is gone.


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

diff --git a/lib/Target/X86/X86ISelDAGToDAG.cpp b/lib/Target/X86/X86ISelDAGToDAG.cpp
index 40b12c7767a..586d6efaa67 100644
--- a/lib/Target/X86/X86ISelDAGToDAG.cpp
+++ b/lib/Target/X86/X86ISelDAGToDAG.cpp
@@ -198,26 +198,12 @@ namespace {
                        SDValue &Scale, SDValue &Index, SDValue &Disp);
     bool SelectTLSADDRAddr(SDNode *Op, SDValue N, SDValue &Base,
                        SDValue &Scale, SDValue &Index, SDValue &Disp);
-    bool SelectScalarSSELoadXXX(SDNode *Root, SDValue N,
+    bool SelectScalarSSELoad(SDNode *Root, SDValue N,
                              SDValue &Base, SDValue &Scale,
                              SDValue &Index, SDValue &Disp,
                              SDValue &Segment,
                              SDValue &NodeWithChain);
     
-    // FIXME: Remove this hacky wrapper.
-    bool SelectScalarSSELoad(SDNode *Root, SDValue N, SDValue &Base,
-                             SDValue &Scale, SDValue &Index,
-                             SDValue &Disp, SDValue &Segment,
-                             SDValue &PatternChainResult,
-                             SDValue &PatternInputChain) {
-      SDValue Tmp;
-      if (!SelectScalarSSELoadXXX(Root, N, Base, Scale, Index, Disp, Segment,
-                                  Tmp))
-        return false;
-      PatternInputChain = Tmp.getOperand(0);
-      PatternChainResult = Tmp.getValue(1);
-      return true;
-    }
     bool TryFoldLoad(SDNode *P, SDValue N,
                      SDValue &Base, SDValue &Scale,
                      SDValue &Index, SDValue &Disp,
@@ -1317,7 +1303,7 @@ bool X86DAGToDAGISel::SelectAddr(SDNode *Op, SDValue N, SDValue &Base,
 /// We also return:
 ///   PatternChainNode: this is the matched node that has a chain input and
 ///   output.
-bool X86DAGToDAGISel::SelectScalarSSELoadXXX(SDNode *Root,
+bool X86DAGToDAGISel::SelectScalarSSELoad(SDNode *Root,
                                           SDValue N, SDValue &Base,
                                           SDValue &Scale, SDValue &Index,
                                           SDValue &Disp, SDValue &Segment,
diff --git a/utils/TableGen/DAGISelMatcherEmitter.cpp b/utils/TableGen/DAGISelMatcherEmitter.cpp
index 7df62a6fa97..36d6f149fdf 100644
--- a/utils/TableGen/DAGISelMatcherEmitter.cpp
+++ b/utils/TableGen/DAGISelMatcherEmitter.cpp
@@ -608,10 +608,6 @@ void MatcherTableEmitter::EmitPredicateFunctions(const CodeGenDAGPatterns &CGP,
       OS << "    Result.resize(Result.size()+" << NumOps << ");\n";
       OS << "    return "  << P.getSelectFunc();
 
-      // FIXME: Temporary hack until old isel dies.
-      if (P.hasProperty(SDNPHasChain))
-        OS << "XXX";
-      
       OS << "(Root, N";
       for (unsigned i = 0; i != NumOps; ++i)
         OS << ", Result[Result.size()-" << (NumOps-i) << ']';