<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[281208] branches/safari-612.1.27.0-branch</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/281208">281208</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2021-08-18 12:51:34 -0700 (Wed, 18 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/280505">r280505</a>. rdar://problem/82088775

    putInlineFastReplacingStaticPropertyIfNeeded should handle custom values
    https://bugs.webkit.org/show_bug.cgi?id=227963

    Reviewed by Alexey Shvayka.

    JSTests:

    * stress/reflect-set-custom-value.js:

    Source/JavaScriptCore:

    Follow up after <a href="http://trac.webkit.org/projects/webkit/changeset/280463">r280463</a>: as it turns out, putInlineFastReplacingStaticPropertyIfNeeded also needs to handle
    custom values, similar to how definePropertyOnReceiverSlow was updated. This function will be called when the
    target property of the receiver is a custom value and isn't reified. The previous test case was expanded to
    test both the reified and non-reified cases.

    * runtime/JSObject.cpp:
    (JSC::JSObject::putInlineFastReplacingStaticPropertyIfNeeded):
    * tools/JSDollarVM.cpp:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280505 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6121270branchJSTestsChangeLog">branches/safari-612.1.27.0-branch/JSTests/ChangeLog</a></li>
<li><a href="#branchessafari6121270branchJSTestsstressreflectsetcustomvaluejs">branches/safari-612.1.27.0-branch/JSTests/stress/reflect-set-custom-value.js</a></li>
<li><a href="#branchessafari6121270branchSourceJavaScriptCoreChangeLog">branches/safari-612.1.27.0-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6121270branchSourceJavaScriptCoreruntimeJSObjectcpp">branches/safari-612.1.27.0-branch/Source/JavaScriptCore/runtime/JSObject.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6121270branchJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.27.0-branch/JSTests/ChangeLog (281207 => 281208)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.27.0-branch/JSTests/ChangeLog      2021-08-18 19:51:29 UTC (rev 281207)
+++ branches/safari-612.1.27.0-branch/JSTests/ChangeLog 2021-08-18 19:51:34 UTC (rev 281208)
</span><span class="lines">@@ -1,5 +1,41 @@
</span><span class="cx"> 2021-08-18  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r280505. rdar://problem/82088775
+
+    putInlineFastReplacingStaticPropertyIfNeeded should handle custom values
+    https://bugs.webkit.org/show_bug.cgi?id=227963
+    
+    Reviewed by Alexey Shvayka.
+    
+    JSTests:
+    
+    * stress/reflect-set-custom-value.js:
+    
+    Source/JavaScriptCore:
+    
+    Follow up after r280463: as it turns out, putInlineFastReplacingStaticPropertyIfNeeded also needs to handle
+    custom values, similar to how definePropertyOnReceiverSlow was updated. This function will be called when the
+    target property of the receiver is a custom value and isn't reified. The previous test case was expanded to
+    test both the reified and non-reified cases.
+    
+    * runtime/JSObject.cpp:
+    (JSC::JSObject::putInlineFastReplacingStaticPropertyIfNeeded):
+    * tools/JSDollarVM.cpp:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280505 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-07-30  Tadeu Zagallo  <tzagallo@apple.com>
+
+            putInlineFastReplacingStaticPropertyIfNeeded should handle custom values
+            https://bugs.webkit.org/show_bug.cgi?id=227963
+
+            Reviewed by Alexey Shvayka.
+
+            * stress/reflect-set-custom-value.js:
+
+2021-08-18  Russell Epstein  <repstein@apple.com>
+
</ins><span class="cx">         Cherry-pick r280463. rdar://problem/82088775
</span><span class="cx"> 
</span><span class="cx">     definePropertyOnReceiver should check if receiver canPerformFastPutInline
</span></span></pre></div>
<a id="branchessafari6121270branchJSTestsstressreflectsetcustomvaluejs"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.27.0-branch/JSTests/stress/reflect-set-custom-value.js (281207 => 281208)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.27.0-branch/JSTests/stress/reflect-set-custom-value.js     2021-08-18 19:51:29 UTC (rev 281207)
+++ branches/safari-612.1.27.0-branch/JSTests/stress/reflect-set-custom-value.js        2021-08-18 19:51:34 UTC (rev 281208)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><del>-const testGetterSetter = $vm.createCustomTestGetterSetter();
-Reflect.set({}, 'customValue', 'foo', testGetterSetter);
-testGetterSetter.customValue = 42;
</del><ins>+{
+    // reified
+    const testGetterSetter = $vm.createCustomTestGetterSetter();
+    Reflect.set({}, 'customValue', 'foo', testGetterSetter);
+    testGetterSetter.customValue = 42;
+}
+
+{
+    // non-reified
+    let tester = $vm.createStaticCustomValue();
+    Reflect.set({}, "testStaticValueSetFlag", 'foo', tester);
+    if (!tester.testStaticValueSetterCalled)
+        throw new Error('Custom value overriden');
+}
</ins></span></pre></div>
<a id="branchessafari6121270branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.27.0-branch/Source/JavaScriptCore/ChangeLog (281207 => 281208)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.27.0-branch/Source/JavaScriptCore/ChangeLog        2021-08-18 19:51:29 UTC (rev 281207)
+++ branches/safari-612.1.27.0-branch/Source/JavaScriptCore/ChangeLog   2021-08-18 19:51:34 UTC (rev 281208)
</span><span class="lines">@@ -1,5 +1,48 @@
</span><span class="cx"> 2021-08-18  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r280505. rdar://problem/82088775
+
+    putInlineFastReplacingStaticPropertyIfNeeded should handle custom values
+    https://bugs.webkit.org/show_bug.cgi?id=227963
+    
+    Reviewed by Alexey Shvayka.
+    
+    JSTests:
+    
+    * stress/reflect-set-custom-value.js:
+    
+    Source/JavaScriptCore:
+    
+    Follow up after r280463: as it turns out, putInlineFastReplacingStaticPropertyIfNeeded also needs to handle
+    custom values, similar to how definePropertyOnReceiverSlow was updated. This function will be called when the
+    target property of the receiver is a custom value and isn't reified. The previous test case was expanded to
+    test both the reified and non-reified cases.
+    
+    * runtime/JSObject.cpp:
+    (JSC::JSObject::putInlineFastReplacingStaticPropertyIfNeeded):
+    * tools/JSDollarVM.cpp:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280505 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-07-30  Tadeu Zagallo  <tzagallo@apple.com>
+
+            putInlineFastReplacingStaticPropertyIfNeeded should handle custom values
+            https://bugs.webkit.org/show_bug.cgi?id=227963
+
+            Reviewed by Alexey Shvayka.
+
+            Follow up after r280463: as it turns out, putInlineFastReplacingStaticPropertyIfNeeded also needs to handle
+            custom values, similar to how definePropertyOnReceiverSlow was updated. This function will be called when the
+            target property of the receiver is a custom value and isn't reified. The previous test case was expanded to
+            test both the reified and non-reified cases.
+
+            * runtime/JSObject.cpp:
+            (JSC::JSObject::putInlineFastReplacingStaticPropertyIfNeeded):
+            * tools/JSDollarVM.cpp:
+
+2021-08-18  Russell Epstein  <repstein@apple.com>
+
</ins><span class="cx">         Cherry-pick r280463. rdar://problem/82088775
</span><span class="cx"> 
</span><span class="cx">     definePropertyOnReceiver should check if receiver canPerformFastPutInline
</span></span></pre></div>
<a id="branchessafari6121270branchSourceJavaScriptCoreruntimeJSObjectcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.27.0-branch/Source/JavaScriptCore/runtime/JSObject.cpp (281207 => 281208)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.27.0-branch/Source/JavaScriptCore/runtime/JSObject.cpp     2021-08-18 19:51:29 UTC (rev 281207)
+++ branches/safari-612.1.27.0-branch/Source/JavaScriptCore/runtime/JSObject.cpp        2021-08-18 19:51:34 UTC (rev 281208)
</span><span class="lines">@@ -942,8 +942,7 @@
</span><span class="cx">                     RELEASE_AND_RETURN(scope, customSetter(structure->globalObject(), JSValue::encode(this), JSValue::encode(value), propertyName));
</span><span class="cx">             }
</span><span class="cx">             // Avoid PutModePut because it fails for non-extensible structures.
</span><del>-            ASSERT(!(entry->value->attributes() & PropertyAttribute::CustomValue));
-            putDirect(vm, propertyName, value, attributesForStructure(entry->value->attributes()), slot);
</del><ins>+            putDirect(vm, propertyName, value, attributesForStructure(entry->value->attributes()) & ~PropertyAttribute::CustomValue, slot);
</ins><span class="cx">             return true;
</span><span class="cx">         }
</span><span class="cx">     }
</span></span></pre>
</div>
</div>

</body>
</html>