[llvm-commits] [llvm] r97420 - /llvm/trunk/include/llvm/CodeGen/DAGISelHeader.h

[Chris Lattner]

Author: lattner
Date: Sun Feb 28 15:56:16 2010
New Revision: 97420

URL: http://llvm.org/viewvc/llvm-project?rev=97420&view=rev
Log:
resolve a fixme by using hte new flag.

Modified:
    llvm/trunk/include/llvm/CodeGen/DAGISelHeader.h

Modified: llvm/trunk/include/llvm/CodeGen/DAGISelHeader.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/DAGISelHeader.h?rev=97420&r1=97419&r2=97420&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/DAGISelHeader.h (original)
+++ llvm/trunk/include/llvm/CodeGen/DAGISelHeader.h Sun Feb 28 15:56:16 2010
@@ -889,17 +889,15 @@
           Res->setNodeId(-1);
         }
         
-        // FIXME: Whether the selected node has a flag result should come from
-        // flags on the node.
         unsigned ResNumResults = Res->getNumValues();
-        if (Res->getValueType(ResNumResults-1) == MVT::Flag) {
-          // Move the flag if needed.
-          if (OldFlagResultNo != -1 &&
-              (unsigned)OldFlagResultNo != ResNumResults-1)
-            ReplaceUses(SDValue(NodeToMatch, OldFlagResultNo), 
-                        SDValue(Res, ResNumResults-1));
+        // Move the flag if needed.
+        if ((EmitNodeInfo & OPFL_FlagOutput) && OldFlagResultNo != -1 &&
+            (unsigned)OldFlagResultNo != ResNumResults-1)
+          ReplaceUses(SDValue(NodeToMatch, OldFlagResultNo), 
+                      SDValue(Res, ResNumResults-1));
+        
+        if ((EmitNodeInfo & OPFL_FlagOutput) != 0)
           --ResNumResults;
-        }
 
         // Move the chain reference if needed.
         if ((EmitNodeInfo & OPFL_Chain) && OldChainResultNo != -1 &&