Changeset 119464 in webkit

Timestamp:

Jun 4, 2012, 11:40:48 PM (14 years ago)

Author:

fpizlo@apple.com

Message:

DFG CFG simplification should correct the variables at the head of the predecessor block
​https://bugs.webkit.org/show_bug.cgi?id=88284

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

• dfg/DFGCFGSimplificationPhase.cpp:

(JSC::DFG::CFGSimplificationPhase::mergeBlocks):

LayoutTests:

• fast/js/dfg-constant-fold-first-local-read-after-block-merge-expected.txt: Added.
• fast/js/dfg-constant-fold-first-local-read-after-block-merge.html: Added.
• fast/js/script-tests/dfg-constant-fold-first-local-read-after-block-merge.js: Added.

(foo):
(bar):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/dfg-constant-fold-first-local-read-after-block-merge-expected.txt (added)
• LayoutTests/fast/js/dfg-constant-fold-first-local-read-after-block-merge.html (added)
• LayoutTests/fast/js/script-tests/dfg-constant-fold-first-local-read-after-block-merge.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/dfg/DFGCFGSimplificationPhase.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-04  Filip Pizlo  <fpizlo@apple.com>
+
+        DFG CFG simplification should correct the variables at the head of the predecessor block
+        https://bugs.webkit.org/show_bug.cgi?id=88284
+
+        Reviewed by Geoffrey Garen.
+
+        * fast/js/dfg-constant-fold-first-local-read-after-block-merge-expected.txt: Added.
+        * fast/js/dfg-constant-fold-first-local-read-after-block-merge.html: Added.
+        * fast/js/script-tests/dfg-constant-fold-first-local-read-after-block-merge.js: Added.
+        (foo):
+        (bar):
+
 2012-06-04  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-06-04  Filip Pizlo  <fpizlo@apple.com>
+
+        DFG CFG simplification should correct the variables at the head of the predecessor block
+        https://bugs.webkit.org/show_bug.cgi?id=88284
+
+        Reviewed by Geoffrey Garen.
+
+        * dfg/DFGCFGSimplificationPhase.cpp:
+        (JSC::DFG::CFGSimplificationPhase::mergeBlocks):
+
 2012-06-04  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/JavaScriptCore/dfg/DFGCFGSimplificationPhase.cpp

@@ -633 +633 @@
                 NodeIndex atFirstIndex = firstBlock->variablesAtTail.operand(node.local());
                 m_graph.changeEdge(node.children.child1(), Edge(skipGetLocal(atFirstIndex)), node.shouldGenerate());
+                
+                if (node.op() != GetLocal)
+                    break;
+                
+                NodeIndex atFirstHeadIndex = firstBlock->variablesAtHead.operand(node.local());
+                if (atFirstHeadIndex == NoNode)
+                    break;
+                
+                if (m_graph[atFirstHeadIndex].op() != Phi)
+                    break;
+                
+                firstBlock->variablesAtHead.operand(node.local()) = nodeIndex;
                 break;
             }