Title: [284806] branches/safari-612-branch/Source/_javascript_Core
Revision
284806
Author
[email protected]
Date
2021-10-25 12:09:53 -0700 (Mon, 25 Oct 2021)

Log Message

Cherry-pick r284506. rdar://problem/84340372

    canDoFastSpread should also check that the Structure is from the global object we're watching
    https://bugs.webkit.org/show_bug.cgi?id=231976
    <rdar://84340372>

    Reviewed by Keith Miller.

    * dfg/DFGGraph.cpp:
    (JSC::DFG::Graph::canDoFastSpread):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284506 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-612-branch/Source/_javascript_Core/ChangeLog (284805 => 284806)


--- branches/safari-612-branch/Source/_javascript_Core/ChangeLog	2021-10-25 19:09:50 UTC (rev 284805)
+++ branches/safari-612-branch/Source/_javascript_Core/ChangeLog	2021-10-25 19:09:53 UTC (rev 284806)
@@ -1,5 +1,32 @@
 2021-10-25  Null  <[email protected]>
 
+        Cherry-pick r284506. rdar://problem/84340372
+
+    canDoFastSpread should also check that the Structure is from the global object we're watching
+    https://bugs.webkit.org/show_bug.cgi?id=231976
+    <rdar://84340372>
+    
+    Reviewed by Keith Miller.
+    
+    * dfg/DFGGraph.cpp:
+    (JSC::DFG::Graph::canDoFastSpread):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284506 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-10-19  Saam Barati  <[email protected]>
+
+            canDoFastSpread should also check that the Structure is from the global object we're watching
+            https://bugs.webkit.org/show_bug.cgi?id=231976
+            <rdar://84340372>
+
+            Reviewed by Keith Miller.
+
+            * dfg/DFGGraph.cpp:
+            (JSC::DFG::Graph::canDoFastSpread):
+
+2021-10-25  Null  <[email protected]>
+
         Cherry-pick r284467. rdar://problem/84327812
 
     Wasm Table can take arbitrary default value

Modified: branches/safari-612-branch/Source/_javascript_Core/dfg/DFGGraph.cpp (284805 => 284806)


--- branches/safari-612-branch/Source/_javascript_Core/dfg/DFGGraph.cpp	2021-10-25 19:09:50 UTC (rev 284805)
+++ branches/safari-612-branch/Source/_javascript_Core/dfg/DFGGraph.cpp	2021-10-25 19:09:53 UTC (rev 284806)
@@ -1843,10 +1843,12 @@
     if (!value.m_structure.isFinite())
         return false;
 
-    ArrayPrototype* arrayPrototype = globalObjectFor(node->child1()->origin.semantic)->arrayPrototype();
+    JSGlobalObject* globalObject = globalObjectFor(node->child1()->origin.semantic);
+    ArrayPrototype* arrayPrototype = globalObject->arrayPrototype();
     bool allGood = true;
     value.m_structure.forEach([&] (RegisteredStructure structure) {
         allGood &= structure->hasMonoProto()
+            && structure->globalObject() == globalObject
             && structure->storedPrototype() == arrayPrototype
             && !structure->isDictionary()
             && structure->getConcurrently(m_vm.propertyNames->iteratorSymbol.impl()) == invalidOffset
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to