Changeset 225834 in webkit

Timestamp:

Dec 12, 2017 7:04:22 PM (6 years ago)

Author:

sbarati@apple.com

Message:

We need to model effects of Spread(@PhantomCreateRest) in Clobberize/PreciseLocalClobberize
​https://bugs.webkit.org/show_bug.cgi?id=180725
<rdar://problem/35970511>

Reviewed by Michael Saboff.

JSTests:

• stress/model-effects-properly-of-spread-over-phantom-create-rest.js: Added.

(f1):
(f2):
(let.o2.valueOf):

Source/JavaScriptCore:

• dfg/DFGClobberize.h:

(JSC::DFG::clobberize):

• dfg/DFGPreciseLocalClobberize.h:

(JSC::DFG::PreciseLocalClobberizeAdaptor::readTop):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/model-effects-properly-of-spread-over-phantom-create-rest.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/dfg/DFGClobberize.h (modified) (1 diff)
• Source/JavaScriptCore/dfg/DFGPreciseLocalClobberize.h (modified) (4 diffs)

trunk/JSTests/ChangeLog

@@ +1 @@
+2017-12-12  Saam Barati  <sbarati@apple.com>
+
+        We need to model effects of Spread(@PhantomCreateRest) in Clobberize/PreciseLocalClobberize
+        https://bugs.webkit.org/show_bug.cgi?id=180725
+        <rdar://problem/35970511>
+
+        Reviewed by Michael Saboff.
+
+        * stress/model-effects-properly-of-spread-over-phantom-create-rest.js: Added.
+        (f1):
+        (f2):
+        (let.o2.valueOf):
+
 2017-12-12  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-12-12  Saam Barati  <sbarati@apple.com>
+
+        We need to model effects of Spread(@PhantomCreateRest) in Clobberize/PreciseLocalClobberize
+        https://bugs.webkit.org/show_bug.cgi?id=180725
+        <rdar://problem/35970511>
+
+        Reviewed by Michael Saboff.
+
+        * dfg/DFGClobberize.h:
+        (JSC::DFG::clobberize):
+        * dfg/DFGPreciseLocalClobberize.h:
+        (JSC::DFG::PreciseLocalClobberizeAdaptor::readTop):
+
 2017-12-12  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/JavaScriptCore/dfg/DFGClobberize.h

@@ -1313 +1313 @@
 
     case Spread: {
+        if (node->child1()->op() == PhantomCreateRest)
+            read(Stack);
+
         if (node->child1().useKind() == ArrayUse) {
             // FIXME: We can probably CSE these together, but we need to construct the right rules

trunk/Source/JavaScriptCore/dfg/DFGPreciseLocalClobberize.h

@@ -121 +121 @@
         };
 
-        auto readPhantomSpreadNode = [&] (Node* spread) {
-            ASSERT(spread->op() == PhantomSpread);
+        auto readSpreadOfPhantomCreateRest = [&] (Node* spread) {
+            ASSERT(spread->op() == Spread || spread->op() == PhantomSpread);
             ASSERT(spread->child1()->op() == PhantomCreateRest);
             InlineCallFrame* inlineCallFrame = spread->child1()->origin.semantic.inlineCallFrame;
@@ -136 +136 @@
                     Node* child = m_graph.varArgChild(arrayWithSpread, i).node();
                     if (child->op() == PhantomSpread)
-                        readPhantomSpreadNode(child);
+                        readSpreadOfPhantomCreateRest(child);
                 }
             }
@@ -182 +182 @@
                     readNewArrayWithSpreadNode(m_node->argumentsChild().node());
                 else
-                    readPhantomSpreadNode(m_node->argumentsChild().node());
+                    readSpreadOfPhantomCreateRest(m_node->argumentsChild().node());
             } else {
                 InlineCallFrame* inlineCallFrame;
@@ -203 +203 @@
             break;
         }
+        
+        case Spread:
+            if (m_node->child1()->op() == PhantomCreateRest)
+                readSpreadOfPhantomCreateRest(m_node);
+            break;
         
         case NewArrayWithSpread: {