<!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>[204995] trunk</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/204995">204995</a></dd>

<dt>Author</dt> <dd>commit-queue@webkit.org</dd>

<dt>Date</dt> <dd>2016-08-25 16:02:52 -0700 (Thu, 25 Aug 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>[JSC] Clean up the abstract interpreter for cos/sin/sqrt/fround/log

https://bugs.webkit.org/show_bug.cgi?id=161181

Patch by Benjamin Poulain &lt;bpoulain@apple.com&gt; on 2016-08-25

Reviewed by Geoffrey Garen.

JSTests:

Extend the tests to constants.

Add no-argument cases where needed.

* stress/arith-cos-on-various-types.js:

* stress/arith-fround-on-various-types.js:

* stress/arith-log-on-various-types.js:

* stress/arith-sin-on-various-types.js:

* stress/arith-sqrt-on-various-types.js:

Source/JavaScriptCore:

All the nodes are doing the exact same thing with a single

difference: how to process constants. I made that into a separate

function called from each node.

I also generalized the constant-to-number code of DoubleRep

to make it available for all those nodes.

* dfg/DFGAbstractInterpreter.h:

* dfg/DFGAbstractInterpreterInlines.h:

(JSC::DFG::AbstractInterpreter&lt;AbstractStateType&gt;::executeEffects):

(JSC::DFG::AbstractInterpreter&lt;AbstractStateType&gt;::executeDoubleUnaryOpEffects):

* runtime/JSCJSValue.cpp:

(JSC::JSValue::toNumberFromPrimitive):

* runtime/JSCJSValue.h:</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>

<li><a href="#trunkJSTestsstressarithcosonvarioustypesjs">trunk/JSTests/stress/arith-cos-on-various-types.js</a></li>

<li><a href="#trunkJSTestsstressarithfroundonvarioustypesjs">trunk/JSTests/stress/arith-fround-on-various-types.js</a></li>

<li><a href="#trunkJSTestsstressarithlogonvarioustypesjs">trunk/JSTests/stress/arith-log-on-various-types.js</a></li>

<li><a href="#trunkJSTestsstressarithsinonvarioustypesjs">trunk/JSTests/stress/arith-sin-on-various-types.js</a></li>

<li><a href="#trunkJSTestsstressarithsqrtonvarioustypesjs">trunk/JSTests/stress/arith-sqrt-on-various-types.js</a></li>

<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>

<li><a href="#trunkSourceJavaScriptCoredfgDFGAbstractInterpreterh">trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreter.h</a></li>

<li><a href="#trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh">trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h</a></li>

<li><a href="#trunkSourceJavaScriptCoreruntimeJSCJSValuecpp">trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCoreruntimeJSCJSValueh">trunk/Source/JavaScriptCore/runtime/JSCJSValue.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkJSTestsChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (204994 => 204995)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/JSTests/ChangeLog        2016-08-25 22:55:10 UTC (rev 204994)

+++ trunk/JSTests/ChangeLog        2016-08-25 23:02:52 UTC (rev 204995)

</span><span class="lines">@@ -1,3 +1,19 @@

</span><ins>+2016-08-25  Benjamin Poulain  &lt;bpoulain@apple.com&gt;

+

+        [JSC] Clean up the abstract interpreter for cos/sin/sqrt/fround/log

+        https://bugs.webkit.org/show_bug.cgi?id=161181

+

+        Reviewed by Geoffrey Garen.

+

+        Extend the tests to constants.

+        Add no-argument cases where needed.

+

+        * stress/arith-cos-on-various-types.js:

+        * stress/arith-fround-on-various-types.js:

+        * stress/arith-log-on-various-types.js:

+        * stress/arith-sin-on-various-types.js:

+        * stress/arith-sqrt-on-various-types.js:

+

</ins><span class="cx"> 2016-08-25  Yusuke Suzuki  &lt;utatane.tea@gmail.com&gt;

</span><span class="cx"> 

</span><span class="cx">         [DFG][FTL] Implement ES6 Generators in DFG / FTL

</span></span></pre></div>

<a id="trunkJSTestsstressarithcosonvarioustypesjs"></a>

<div class="modfile"><h4>Modified: trunk/JSTests/stress/arith-cos-on-various-types.js (204994 => 204995)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/JSTests/stress/arith-cos-on-various-types.js        2016-08-25 22:55:10 UTC (rev 204994)

+++ trunk/JSTests/stress/arith-cos-on-various-types.js        2016-08-25 23:02:52 UTC (rev 204995)

</span><span class="lines">@@ -34,6 +34,26 @@

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> 

<ins>+// Test Math.cos() without arguments.

+function opaqueCosNoArgument() {

+    return Math.cos();

+}

+noInline(opaqueCosNoArgument);

+noOSRExitFuzzing(opaqueCosNoArgument);

+

+function testNoArgument() {

+    for (let i = 0; i &lt; 1e4; ++i) {

+        let output = opaqueCosNoArgument();

+        if (output === output) {

+            throw &quot;Failed opaqueCosNoArgument&quot;;

+        }

+    }

+    if (numberOfDFGCompiles(opaqueCosNoArgument) &gt; 1)

+        throw &quot;The call without arguments should never exit.&quot;;

+}

+testNoArgument();

+

+

</ins><span class="cx"> // Test Math.cos() with a very polymorphic input. All test cases are seen at each iteration.

</span><span class="cx"> function opaqueAllTypesCos(argument) {

</span><span class="cx">     return Math.cos(argument);

</span><span class="lines">@@ -78,6 +98,29 @@

</span><span class="cx"> testSingleTypeCall();

</span><span class="cx"> 

</span><span class="cx"> 

</span><ins>+// Test Math.cos() on constants

+function testConstant() {

+    for (let testCaseInput of validInputTestCases) {

+        eval(`

+            function opaqueCosOnConstant() {

+                return Math.cos(${testCaseInput[0]});

+            }

+            noInline(opaqueCosOnConstant);

+            noOSRExitFuzzing(opaqueCosOnConstant);

+

+            for (let i = 0; i &lt; 1e4; ++i) {

+                if (!isIdentical(opaqueCosOnConstant(), ${testCaseInput[1]})) {

+                    throw &quot;Failed testConstant()&quot;;

+                }

+            }

+            if (numberOfDFGCompiles(opaqueCosOnConstant) &gt; 1)

+                throw &quot;We should have compiled a single cos for the expected type.&quot;;

+        `);

+    }

+}

+testConstant();

+

+