Title: [230246] branches/safari-605-branch
Revision
230246
Author
[email protected]
Date
2018-04-03 23:11:08 -0700 (Tue, 03 Apr 2018)

Log Message

Cherry-pick r229987. rdar://problem/39155464

    DFG should know that CreateThis can be effectful
    https://bugs.webkit.org/show_bug.cgi?id=184013

    Reviewed by Saam Barati.

    JSTests:

    * stress/create-this-property-change.js: Added.
    (Foo):
    (RealBar):
    (get if):
    * stress/create-this-structure-change-without-cse.js: Added.
    (Foo):
    (RealBar):
    (get if):
    * stress/create-this-structure-change.js: Added.
    (Foo):
    (RealBar):
    (get if):

    Source/_javascript_Core:

    As shown in the tests added in JSTests, CreateThis can be effectful if the constructor this
    is a proxy.

    * dfg/DFGAbstractInterpreterInlines.h:
    (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
    * dfg/DFGClobberize.h:
    (JSC::DFG::clobberize):

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

Modified Paths

Added Paths

Diff

Modified: branches/safari-605-branch/JSTests/ChangeLog (230245 => 230246)


--- branches/safari-605-branch/JSTests/ChangeLog	2018-04-04 06:02:53 UTC (rev 230245)
+++ branches/safari-605-branch/JSTests/ChangeLog	2018-04-04 06:11:08 UTC (rev 230246)
@@ -1,5 +1,61 @@
 2018-04-03  Jason Marcell  <[email protected]>
 
+        Cherry-pick r229987. rdar://problem/39155464
+
+    DFG should know that CreateThis can be effectful
+    https://bugs.webkit.org/show_bug.cgi?id=184013
+    
+    Reviewed by Saam Barati.
+    
+    JSTests:
+    
+    * stress/create-this-property-change.js: Added.
+    (Foo):
+    (RealBar):
+    (get if):
+    * stress/create-this-structure-change-without-cse.js: Added.
+    (Foo):
+    (RealBar):
+    (get if):
+    * stress/create-this-structure-change.js: Added.
+    (Foo):
+    (RealBar):
+    (get if):
+    
+    Source/_javascript_Core:
+    
+    As shown in the tests added in JSTests, CreateThis can be effectful if the constructor this
+    is a proxy.
+    
+    * dfg/DFGAbstractInterpreterInlines.h:
+    (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+    * dfg/DFGClobberize.h:
+    (JSC::DFG::clobberize):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229987 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-03-26  Filip Pizlo  <[email protected]>
+
+            DFG should know that CreateThis can be effectful
+            https://bugs.webkit.org/show_bug.cgi?id=184013
+
+            Reviewed by Saam Barati.
+
+            * stress/create-this-property-change.js: Added.
+            (Foo):
+            (RealBar):
+            (get if):
+            * stress/create-this-structure-change-without-cse.js: Added.
+            (Foo):
+            (RealBar):
+            (get if):
+            * stress/create-this-structure-change.js: Added.
+            (Foo):
+            (RealBar):
+            (get if):
+
+2018-04-03  Jason Marcell  <[email protected]>
+
         Cherry-pick r230143. rdar://problem/39155381
 
     JSC crash in JIT code with for-of loop and Array/Set iterators

Added: branches/safari-605-branch/JSTests/stress/create-this-property-change.js (0 => 230246)


--- branches/safari-605-branch/JSTests/stress/create-this-property-change.js	                        (rev 0)
+++ branches/safari-605-branch/JSTests/stress/create-this-property-change.js	2018-04-04 06:11:08 UTC (rev 230246)
@@ -0,0 +1,49 @@
+var globalO;
+
+function Foo()
+{
+    this.g = 42;
+}
+
+class RealBar extends Foo {
+    constructor()
+    {
+        var o = globalO;
+        var result = o.f;
+        super();
+        result += o.f;
+        this.result = result;
+    }
+}
+
+var doIntercept = false;
+var didExecuteFGetter = false;
+var Bar = new Proxy(RealBar, {
+    get: function(target, property, receiver) {
+        if (property == "prototype" && doIntercept) {
+            globalO.f = 666;
+            didExecuteFGetter = true;
+        }
+        return Reflect.get(target, property, receiver);
+    }
+});
+
+noInline(RealBar);
+
+for (var i = 0; i < 10000; ++i) {
+    (function() {
+        globalO = {f:43};
+        var result = new Bar().result;
+        if (result != 86)
+            throw "bad result in loop: " + result;
+    })();
+}
+
+doIntercept = true;
+globalO = {f:43};
+var result = new Bar().result;
+if (result != 709)
+    throw "bad result at end: " + result;
+if (!didExecuteFGetter)
+    throw "did not execute f getter";
+

Added: branches/safari-605-branch/JSTests/stress/create-this-structure-change-without-cse.js (0 => 230246)


--- branches/safari-605-branch/JSTests/stress/create-this-structure-change-without-cse.js	                        (rev 0)
+++ branches/safari-605-branch/JSTests/stress/create-this-structure-change-without-cse.js	2018-04-04 06:11:08 UTC (rev 230246)
@@ -0,0 +1,51 @@
+var globalO;
+
+function Foo()
+{
+    this.f = 42;
+}
+
+class RealBar extends Foo {
+    constructor()
+    {
+        var o = globalO;
+        var result = o.f;
+        super();
+        result += o.f;
+        this.result = result;
+    }
+}
+
+var doIntercept = false;
+var didExecuteFGetter = false;
+var Bar = new Proxy(RealBar, {
+    get: function(target, property, receiver) {
+        if (property == "prototype" && doIntercept) {
+            globalO.__defineGetter__("f", function() {
+                didExecuteFGetter = true;
+                return 666;
+            });
+        }
+        return Reflect.get(target, property, receiver);
+    }
+});
+
+noInline(RealBar);
+
+for (var i = 0; i < 10000; ++i) {
+    (function() {
+        globalO = {f:43};
+        var result = new Bar().result;
+        if (result != 86)
+            throw "bad result in loop: " + result;
+    })();
+}
+
+doIntercept = true;
+globalO = {f:43};
+var result = new Bar().result;
+if (result != 709)
+    throw "bad result at end: " + result;
+if (!didExecuteFGetter)
+    throw "did not execute f getter";
+

Added: branches/safari-605-branch/JSTests/stress/create-this-structure-change.js (0 => 230246)


--- branches/safari-605-branch/JSTests/stress/create-this-structure-change.js	                        (rev 0)
+++ branches/safari-605-branch/JSTests/stress/create-this-structure-change.js	2018-04-04 06:11:08 UTC (rev 230246)
@@ -0,0 +1,51 @@
+var globalO;
+
+function Foo()
+{
+    this.g = 42;
+}
+
+class RealBar extends Foo {
+    constructor()
+    {
+        var o = globalO;
+        var result = o.f;
+        super();
+        result += o.f;
+        this.result = result;
+    }
+}
+
+var doIntercept = false;
+var didExecuteFGetter = false;
+var Bar = new Proxy(RealBar, {
+    get: function(target, property, receiver) {
+        if (property == "prototype" && doIntercept) {
+            globalO.__defineGetter__("f", function() {
+                didExecuteFGetter = true;
+                return 666;
+            });
+        }
+        return Reflect.get(target, property, receiver);
+    }
+});
+
+noInline(RealBar);
+
+for (var i = 0; i < 10000; ++i) {
+    (function() {
+        globalO = {f:43};
+        var result = new Bar().result;
+        if (result != 86)
+            throw "bad result in loop: " + result;
+    })();
+}
+
+doIntercept = true;
+globalO = {f:43};
+var result = new Bar().result;
+if (result != 709)
+    throw "bad result at end: " + result;
+if (!didExecuteFGetter)
+    throw "did not execute f getter";
+

Modified: branches/safari-605-branch/Source/_javascript_Core/ChangeLog (230245 => 230246)


--- branches/safari-605-branch/Source/_javascript_Core/ChangeLog	2018-04-04 06:02:53 UTC (rev 230245)
+++ branches/safari-605-branch/Source/_javascript_Core/ChangeLog	2018-04-04 06:11:08 UTC (rev 230246)
@@ -1,5 +1,56 @@
 2018-04-03  Jason Marcell  <[email protected]>
 
+        Cherry-pick r229987. rdar://problem/39155464
+
+    DFG should know that CreateThis can be effectful
+    https://bugs.webkit.org/show_bug.cgi?id=184013
+    
+    Reviewed by Saam Barati.
+    
+    JSTests:
+    
+    * stress/create-this-property-change.js: Added.
+    (Foo):
+    (RealBar):
+    (get if):
+    * stress/create-this-structure-change-without-cse.js: Added.
+    (Foo):
+    (RealBar):
+    (get if):
+    * stress/create-this-structure-change.js: Added.
+    (Foo):
+    (RealBar):
+    (get if):
+    
+    Source/_javascript_Core:
+    
+    As shown in the tests added in JSTests, CreateThis can be effectful if the constructor this
+    is a proxy.
+    
+    * dfg/DFGAbstractInterpreterInlines.h:
+    (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+    * dfg/DFGClobberize.h:
+    (JSC::DFG::clobberize):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229987 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-03-26  Filip Pizlo  <[email protected]>
+
+            DFG should know that CreateThis can be effectful
+            https://bugs.webkit.org/show_bug.cgi?id=184013
+
+            Reviewed by Saam Barati.
+
+            As shown in the tests added in JSTests, CreateThis can be effectful if the constructor this
+            is a proxy.
+
+            * dfg/DFGAbstractInterpreterInlines.h:
+            (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+            * dfg/DFGClobberize.h:
+            (JSC::DFG::clobberize):
+
+2018-04-03  Jason Marcell  <[email protected]>
+
         Cherry-pick r230143. rdar://problem/39155381
 
     JSC crash in JIT code with for-of loop and Array/Set iterators

Modified: branches/safari-605-branch/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h (230245 => 230246)


--- branches/safari-605-branch/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h	2018-04-04 06:02:53 UTC (rev 230245)
+++ branches/safari-605-branch/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h	2018-04-04 06:11:08 UTC (rev 230246)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2018 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -2218,6 +2218,7 @@
 
     case CreateThis: {
         // FIXME: We can fold this to NewObject if the incoming callee is a constant.
+        clobberWorld(node->origin.semantic, clobberLimit);
         forNode(node).setType(m_graph, SpecFinalObject);
         break;
     }

Modified: branches/safari-605-branch/Source/_javascript_Core/dfg/DFGClobberize.h (230245 => 230246)


--- branches/safari-605-branch/Source/_javascript_Core/dfg/DFGClobberize.h	2018-04-04 06:02:53 UTC (rev 230245)
+++ branches/safari-605-branch/Source/_javascript_Core/dfg/DFGClobberize.h	2018-04-04 06:11:08 UTC (rev 230246)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2018 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -271,14 +271,6 @@
         write(MathDotRandomState);
         return;
 
-    case HasGenericProperty:
-    case HasStructureProperty:
-    case GetPropertyEnumerator: {
-        read(World);
-        write(Heap);
-        return;
-    }
-
     case GetEnumerableLength: {
         read(Heap);
         write(SideState);
@@ -285,14 +277,6 @@
         return;
     }
 
-    case GetDirectPname: {
-        // This reads and writes heap because it can end up calling a generic getByVal 
-        // if the Structure changed, which could in turn end up calling a getter.
-        read(World);
-        write(Heap);
-        return;
-    }
-
     case ToIndexString:
     case GetEnumeratorStructurePname:
     case GetEnumeratorGenericPname: {
@@ -536,11 +520,6 @@
         write(HeapObjectCount);
         return;
 
-    case ToObject:
-        read(World);
-        write(Heap);
-        return;
-
     case CallObjectConstructor:
         read(HeapObjectCount);
         write(HeapObjectCount);
@@ -547,7 +526,6 @@
         return;
 
     case ToThis:
-    case CreateThis:
         read(MiscFields);
         read(HeapObjectCount);
         write(HeapObjectCount);
@@ -644,6 +622,15 @@
     case PutDynamicVar:
     case ResolveScopeForHoistingFuncDeclInEval:
     case ResolveScope:
+    case ToObject:
+    case HasGenericProperty:
+    case HasStructureProperty:
+    case GetPropertyEnumerator:
+    case GetDirectPname:
+    case InstanceOfCustom:
+    case ToNumber:
+    case NumberToStringWithRadix:
+    case CreateThis:
         read(World);
         write(Heap);
         return;
@@ -1030,11 +1017,6 @@
         def(HeapLocation(InstanceOfLoc, JSCell_structureID, node->child1(), node->child2()), LazyNode(node));
         return;
 
-    case InstanceOfCustom:
-        read(World);
-        write(Heap);
-        return;
-
     case PutStructure:
         read(JSObject_butterfly);
         write(JSCell_structureID);
@@ -1562,12 +1544,6 @@
         def(PureValue(node));
         return;
 
-    case ToNumber: {
-        read(World);
-        write(Heap);
-        return;
-    }
-        
     case ToString:
     case CallStringConstructor:
         switch (node->child1().useKind()) {
@@ -1693,12 +1669,6 @@
         def(PureValue(node));
         return;
 
-    case NumberToStringWithRadix:
-        // If the radix is invalid, NumberToStringWithRadix can throw an error.
-        read(World);
-        write(Heap);
-        return;
-
     case NumberToStringWithValidRadixConstant:
         def(PureValue(node, node->validRadixConstant()));
         return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to