webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 18 insertions, 9 deletions

diff --git a/Source/JavaScriptCore/dfg/DFGAtTailAbstractState.cpp b/Source/JavaScriptCore/dfg/DFGAtTailAbstractState.cpp
index ca770681a..8d14c9cba 100644
--- a/Source/JavaScriptCore/dfg/DFGAtTailAbstractState.cpp
+++ b/Source/JavaScriptCore/dfg/DFGAtTailAbstractState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013, 2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -25,29 +25,38 @@
 
 #include "config.h"
 #include "DFGAtTailAbstractState.h"
+#include "DFGBlockMapInlines.h"
 
 #if ENABLE(DFG_JIT)
 
-#include "Operations.h"
+#include "JSCInlines.h"
 
 namespace JSC { namespace DFG {
 
-AtTailAbstractState::AtTailAbstractState()
-    : m_block(0)
+AtTailAbstractState::AtTailAbstractState(Graph& graph)
+    : m_graph(graph)
+    , m_valuesAtTailMap(m_graph)
 {
+    for (BasicBlock* block : graph.blocksInNaturalOrder()) {
+        auto& valuesAtTail = m_valuesAtTailMap.at(block);
+        valuesAtTail.clear();
+        for (auto& valueAtTailPair : block->ssa->valuesAtTail)
+            valuesAtTail.add(valueAtTailPair.node, valueAtTailPair.value);
+    }
 }
 
 AtTailAbstractState::~AtTailAbstractState() { }
 
-void AtTailAbstractState::createValueForNode(Node* node)
+void AtTailAbstractState::createValueForNode(NodeFlowProjection node)
 {
-    m_block->ssa->valuesAtTail.add(node, AbstractValue());
+    m_valuesAtTailMap.at(m_block).add(node, AbstractValue());
 }
 
-AbstractValue& AtTailAbstractState::forNode(Node* node)
+AbstractValue& AtTailAbstractState::forNode(NodeFlowProjection node)
 {
-    HashMap<Node*, AbstractValue>::iterator iter = m_block->ssa->valuesAtTail.find(node);
-    ASSERT(iter != m_block->ssa->valuesAtTail.end());
+    auto& valuesAtTail = m_valuesAtTailMap.at(m_block);
+    HashMap<NodeFlowProjection, AbstractValue>::iterator iter = valuesAtTail.find(node);
+    DFG_ASSERT(m_graph, node.node(), iter != valuesAtTail.end());
     return iter->value;
 }