diff --git a/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp b/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
index 85a96a8e265..76b7527f68b 100644
--- a/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
+++ b/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
@@ -234,7 +234,8 @@ namespace {
       // Node updates can mean pretty much anything.  It is possible that an
       // operand was set to something already processed (f.e.) in which case
       // this node could become ready.  Recompoute its flags.
-      DTL.ReanalyzeNodeFlags(N);
+      if (N->getNodeId() != DAGTypeLegalizer::ReadyToProcess)
+        DTL.ReanalyzeNodeFlags(N);
     }
   };
 }
diff --git a/lib/CodeGen/SelectionDAG/LegalizeTypes.h b/lib/CodeGen/SelectionDAG/LegalizeTypes.h
index 912747df704..23d9bf125ec 100644
--- a/lib/CodeGen/SelectionDAG/LegalizeTypes.h
+++ b/lib/CodeGen/SelectionDAG/LegalizeTypes.h
@@ -40,7 +40,7 @@ namespace llvm {
 class VISIBILITY_HIDDEN DAGTypeLegalizer {
   TargetLowering &TLI;
   SelectionDAG &DAG;
-  
+public:
   // NodeIDFlags - This pass uses the NodeID on the SDNodes to hold information
   // about the state of the node.  The enum has all the values.
   enum NodeIDFlags {
@@ -57,7 +57,7 @@ class VISIBILITY_HIDDEN DAGTypeLegalizer {
     
     // 1+ - This is a node which has this many unlegalized operands.
   };
-  
+private:
   enum LegalizeAction {
     Legal,      // The target natively supports this type.
     Promote,    // This type should be executed in a larger type.