<!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>[224382] branches/safari-604.4.7.10-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/224382">224382</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2017-11-02 22:31:15 -0700 (Thu, 02 Nov 2017)</dd>
</dl>

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

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6044710branchJSTestsChangeLog">branches/safari-604.4.7.10-branch/JSTests/ChangeLog</a></li>
<li><a href="#branchessafari6044710branchSourceJavaScriptCoreChangeLog">branches/safari-604.4.7.10-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6044710branchSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh">branches/safari-604.4.7.10-branch/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6044710branchJSTestsstressarithclz32effectsjs">branches/safari-604.4.7.10-branch/JSTests/stress/arith-clz32-effects.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6044710branchJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-604.4.7.10-branch/JSTests/ChangeLog (224381 => 224382)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604.4.7.10-branch/JSTests/ChangeLog      2017-11-03 05:30:18 UTC (rev 224381)
+++ branches/safari-604.4.7.10-branch/JSTests/ChangeLog 2017-11-03 05:31:15 UTC (rev 224382)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-11-02  Jason Marcell  <jmarcell@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r224349. rdar://problem/35329728
+
+    2017-11-02  Filip Pizlo  <fpizlo@apple.com>
+
+            AI does not correctly model the clobber case of ArithClz32
+            https://bugs.webkit.org/show_bug.cgi?id=179188
+
+            Reviewed by Michael Saboff.
+
+            * stress/arith-clz32-effects.js: Added.
+            (foo):
+            (valueOf):
+
+2017-11-02  Jason Marcell  <jmarcell@apple.com>
+
</ins><span class="cx">         Cherry-pick r224302. rdar://problem/35323822
</span><span class="cx"> 
</span><span class="cx">     2017-11-01  Michael Saboff  <msaboff@apple.com>
</span></span></pre></div>
<a id="branchessafari6044710branchJSTestsstressarithclz32effectsjs"></a>
<div class="addfile"><h4>Added: branches/safari-604.4.7.10-branch/JSTests/stress/arith-clz32-effects.js (0 => 224382)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604.4.7.10-branch/JSTests/stress/arith-clz32-effects.js                          (rev 0)
+++ branches/safari-604.4.7.10-branch/JSTests/stress/arith-clz32-effects.js     2017-11-03 05:31:15 UTC (rev 224382)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+function foo(o, v)
+{
+    var result = o.f;
+    Math.clz32(v);
+    return result + o.f;
+}
+
+noInline(foo);
+
+var o = {f: 42};
+o.g = 43; // Bust the transition watchpoint of {f}.
+
+for (var i = 0; i < 10000; ++i) {
+    var result = foo({f: 42}, "42");
+    if (result != 84)
+        throw "Error: bad result in loop: " + result;
+}
+
+var o = {f: 43};
+var result = foo(o, {
+    valueOf: function()
+    {
+        delete o.f;
+        o.__defineGetter__("f", function() { return 44; });
+    }
+});
+
+if (result != 87)
+    throw "Error: bad result at end: " + result;
+
</ins></span></pre></div>
<a id="branchessafari6044710branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-604.4.7.10-branch/Source/JavaScriptCore/ChangeLog (224381 => 224382)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604.4.7.10-branch/Source/JavaScriptCore/ChangeLog        2017-11-03 05:30:18 UTC (rev 224381)
+++ branches/safari-604.4.7.10-branch/Source/JavaScriptCore/ChangeLog   2017-11-03 05:31:15 UTC (rev 224382)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2017-11-02  Jason Marcell  <jmarcell@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r224349. rdar://problem/35329728
+
+    2017-11-02  Filip Pizlo  <fpizlo@apple.com>
+
+            AI does not correctly model the clobber case of ArithClz32
+            https://bugs.webkit.org/show_bug.cgi?id=179188
+
+            Reviewed by Michael Saboff.
+
+            The non-Int32 case clobbers the world because it may call valueOf.
+
+            * dfg/DFGAbstractInterpreterInlines.h:
+            (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+
+2017-11-02  Jason Marcell  <jmarcell@apple.com>
+
</ins><span class="cx">         Cherry-pick r224302. rdar://problem/35323822
</span><span class="cx"> 
</span><span class="cx">     2017-11-01  Michael Saboff  <msaboff@apple.com>
</span></span></pre></div>
<a id="branchessafari6044710branchSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: branches/safari-604.4.7.10-branch/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (224381 => 224382)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604.4.7.10-branch/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h      2017-11-03 05:30:18 UTC (rev 224381)
+++ branches/safari-604.4.7.10-branch/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2017-11-03 05:31:15 UTC (rev 224382)
</span><span class="lines">@@ -561,6 +561,14 @@
</span><span class="cx">             setConstant(node, jsNumber(clz32(value)));
</span><span class="cx">             break;
</span><span class="cx">         }
</span><ins>+        switch (node->child1().useKind()) {
+        case Int32Use:
+        case KnownInt32Use:
+            break;
+        default:
+            clobberWorld(node->origin.semantic, clobberLimit);
+            break;
+        }
</ins><span class="cx">         forNode(node).setType(SpecInt32Only);
</span><span class="cx">         break;
</span><span class="cx">     }
</span></span></pre>
</div>
</div>

</body>
</html>