Title: [170383] branches/ftlopt/Source/_javascript_Core
Revision
170383
Author
fpi...@apple.com
Date
2014-06-24 12:52:46 -0700 (Tue, 24 Jun 2014)

Log Message

[ftlopt] PutByIdFlush can also be converted to a PutByOffset so don't assert otherwise
https://bugs.webkit.org/show_bug.cgi?id=134265

Reviewed by Geoffrey Garen.
        
More assertion fallout from the PutById folding work.

* dfg/DFGNode.h:
(JSC::DFG::Node::convertToPutByOffset):

Modified Paths

Diff

Modified: branches/ftlopt/Source/_javascript_Core/ChangeLog (170382 => 170383)


--- branches/ftlopt/Source/_javascript_Core/ChangeLog	2014-06-24 19:51:11 UTC (rev 170382)
+++ branches/ftlopt/Source/_javascript_Core/ChangeLog	2014-06-24 19:52:46 UTC (rev 170383)
@@ -1,5 +1,17 @@
 2014-06-24  Filip Pizlo  <fpi...@apple.com>
 
+        [ftlopt] PutByIdFlush can also be converted to a PutByOffset so don't assert otherwise
+        https://bugs.webkit.org/show_bug.cgi?id=134265
+
+        Reviewed by Geoffrey Garen.
+        
+        More assertion fallout from the PutById folding work.
+
+        * dfg/DFGNode.h:
+        (JSC::DFG::Node::convertToPutByOffset):
+
+2014-06-24  Filip Pizlo  <fpi...@apple.com>
+
         [ftlopt] GC should notify us if it resets to_this
         https://bugs.webkit.org/show_bug.cgi?id=128231
 

Modified: branches/ftlopt/Source/_javascript_Core/dfg/DFGNode.h (170382 => 170383)


--- branches/ftlopt/Source/_javascript_Core/dfg/DFGNode.h	2014-06-24 19:51:11 UTC (rev 170382)
+++ branches/ftlopt/Source/_javascript_Core/dfg/DFGNode.h	2014-06-24 19:52:46 UTC (rev 170383)
@@ -469,7 +469,7 @@
     
     void convertToPutByOffset(unsigned storageAccessDataIndex, Edge storage)
     {
-        ASSERT(m_op == PutById || m_op == PutByIdDirect || m_op == MultiPutByOffset);
+        ASSERT(m_op == PutById || m_op == PutByIdDirect || m_op == PutByIdFlush || m_op == MultiPutByOffset);
         m_opInfo = storageAccessDataIndex;
         children.setChild3(children.child2());
         children.setChild2(children.child1());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to