1 files changed, 11 insertions, 8 deletions

diff --git a/Source/JavaScriptCore/dfg/DFGMinifiedNode.h b/Source/JavaScriptCore/dfg/DFGMinifiedNode.h
index b80cbd777..a1702903e 100644
--- a/Source/JavaScriptCore/dfg/DFGMinifiedNode.h
+++ b/Source/JavaScriptCore/dfg/DFGMinifiedNode.h
@@ -31,6 +31,7 @@
 #if ENABLE(DFG_JIT)
 
 #include "DFGCommon.h"
+#include "DFGMinifiedID.h"
 #include "DFGNodeType.h"
 
 namespace JSC { namespace DFG {
@@ -44,6 +45,7 @@ inline bool belongsInMinifiedGraph(NodeType type)
     case WeakJSConstant:
     case ValueToInt32:
     case Int32ToDouble:
+    case ForwardInt32ToDouble:
     case UInt32ToNumber:
     case DoubleAsInt32:
     case PhantomArguments:
@@ -57,17 +59,17 @@ class MinifiedNode {
 public:
     MinifiedNode() { }
     
-    static MinifiedNode fromNode(NodeIndex, Node&);
+    static MinifiedNode fromNode(Node*);
     
-    NodeIndex index() const { return m_index; }
+    MinifiedID id() const { return m_id; }
     NodeType op() const { return m_op; }
     
     bool hasChild1() const { return hasChild(m_op); }
     
-    NodeIndex child1() const
+    MinifiedID child1() const
     {
         ASSERT(hasChild(m_op));
-        return m_childOrInfo;
+        return MinifiedID::fromBits(m_childOrInfo);
     }
     
     bool hasConstant() const { return hasConstantNumber() || hasWeakConstant(); }
@@ -88,10 +90,10 @@ public:
         return bitwise_cast<JSCell*>(m_childOrInfo);
     }
     
-    static NodeIndex getIndex(MinifiedNode* node) { return node->index(); }
+    static MinifiedID getID(MinifiedNode* node) { return node->id(); }
     static bool compareByNodeIndex(const MinifiedNode& a, const MinifiedNode& b)
     {
-        return a.m_index < b.m_index;
+        return a.m_id < b.m_id;
     }
     
 private:
@@ -100,6 +102,7 @@ private:
         switch (type) {
         case ValueToInt32:
         case Int32ToDouble:
+        case ForwardInt32ToDouble:
         case UInt32ToNumber:
         case DoubleAsInt32:
             return true;
@@ -116,9 +119,9 @@ private:
         return type == WeakJSConstant;
     }
     
-    NodeIndex m_index;
-    NodeType m_op;
+    MinifiedID m_id;
     uintptr_t m_childOrInfo; // Nodes in the minified graph have only one child each.
+    NodeType m_op;
 };
 
 } } // namespace JSC::DFG