<!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>[164819] 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/164819">164819</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-27 11:39:42 -0800 (Thu, 27 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Math.{max, min}() must not return after first NaN value
https://bugs.webkit.org/show_bug.cgi?id=104147
Patch by Tibor Meszaros <tmeszaros.u-szeged@partner.samsung.com> on 2014-02-27
Reviewed by Oliver Hunt.
Source/JavaScriptCore:
According to the spec, ToNumber going to be called on each argument
even if a `NaN` value was already found
* runtime/MathObject.cpp:
(JSC::mathProtoFuncMax):
(JSC::mathProtoFuncMin):
LayoutTests:
Extended the Math.{max, min}() tests, to check that these methods are return after first NaN value or not.
* js/math-expected.txt:
* js/script-tests/math.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsmathexpectedtxt">trunk/LayoutTests/js/math-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsmathjs">trunk/LayoutTests/js/script-tests/math.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeMathObjectcpp">trunk/Source/JavaScriptCore/runtime/MathObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164818 => 164819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-27 19:20:08 UTC (rev 164818)
+++ trunk/LayoutTests/ChangeLog 2014-02-27 19:39:42 UTC (rev 164819)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-02-27 Tibor Meszaros <tmeszaros.u-szeged@partner.samsung.com>
+
+ Math.{max, min}() must not return after first NaN value
+ https://bugs.webkit.org/show_bug.cgi?id=104147
+
+ Reviewed by Oliver Hunt.
+
+ Extended the Math.{max, min}() tests, to check that these methods are return after first NaN value or not.
+
+ * js/math-expected.txt:
+ * js/script-tests/math.js:
+
</ins><span class="cx"> 2014-02-27 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> speechSynthesis.speak of a zero length utterance kills future speech
</span></span></pre></div>
<a id="trunkLayoutTestsjsmathexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/math-expected.txt (164818 => 164819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/math-expected.txt 2014-02-27 19:20:08 UTC (rev 164818)
+++ trunk/LayoutTests/js/math-expected.txt 2014-02-27 19:39:42 UTC (rev 164819)
</span><span class="lines">@@ -97,12 +97,24 @@
</span><span class="cx"> PASS Math.max(0) is 0
</span><span class="cx"> PASS Math.max(-0) is -0
</span><span class="cx"> PASS Math.max(-0, 0) is 0
</span><ins>+PASS Math.max(NaN, {valueOf:function(){throw "err"}}) threw exception err.
+PASS Math.max(NaN, NaN, {valueOf:function(){throw "err"}}) threw exception err.
+PASS Math.max(-0, NaN, 0) is NaN
+PASS Math.max(-0, NaN, 0, NaN) is NaN
+PASS Math.max({valueOf:function(){throw "error1"}}, {valueOf:function(){sideEffect = 1}}) threw exception error1.
+PASS sideEffect is 0
</ins><span class="cx"> PASS Math.min() is Infinity
</span><span class="cx"> PASS Math.min(NaN) is NaN
</span><span class="cx"> PASS Math.min(NaN,1) is NaN
</span><span class="cx"> PASS Math.min(0) is 0
</span><span class="cx"> PASS Math.min(-0) is -0
</span><span class="cx"> PASS Math.min(-0, 0) is -0
</span><ins>+PASS Math.min(NaN, {valueOf:function(){throw "err"}}) threw exception err.
+PASS Math.min(NaN, NaN, {valueOf:function(){throw "err"}}) threw exception err.
+PASS Math.min(-0, NaN, 0) is NaN
+PASS Math.min(-0, NaN, 0, NaN) is NaN
+PASS Math.min({valueOf:function(){throw "error1"}}, {valueOf:function(){sideEffect = 1}}) threw exception error1.
+PASS sideEffect is 0
</ins><span class="cx"> PASS Math.pow(NaN, NaN) is NaN
</span><span class="cx"> PASS Math.pow(NaN, 0) is 1
</span><span class="cx"> PASS Math.pow(NaN, -0) is 1
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsmathjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/math.js (164818 => 164819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/math.js 2014-02-27 19:20:08 UTC (rev 164818)
+++ trunk/LayoutTests/js/script-tests/math.js 2014-02-27 19:39:42 UTC (rev 164819)
</span><span class="lines">@@ -139,6 +139,13 @@
</span><span class="cx"> shouldBe("Math.max(0)", "0");
</span><span class="cx"> shouldBe("Math.max(-0)", "-0");
</span><span class="cx"> shouldBe("Math.max(-0, 0)", "0");
</span><ins>+shouldThrow("Math.max(NaN, {valueOf:function(){throw \"err\"}})","'err'");
+shouldThrow("Math.max(NaN, NaN, {valueOf:function(){throw \"err\"}})","'err'");
+shouldBe("Math.max(-0, NaN, 0)", "NaN");
+shouldBe("Math.max(-0, NaN, 0, NaN)", "NaN");
+sideEffect = 0;
+shouldThrow("Math.max({valueOf:function(){throw \"error1\"}}, {valueOf:function(){sideEffect = 1}})", "'error1'")
+shouldBe('sideEffect', '0');
</ins><span class="cx">
</span><span class="cx"> shouldBe("Math.min()", "Infinity");
</span><span class="cx"> shouldBe("Math.min(NaN)", "NaN");
</span><span class="lines">@@ -146,6 +153,13 @@
</span><span class="cx"> shouldBe("Math.min(0)", "0");
</span><span class="cx"> shouldBe("Math.min(-0)", "-0");
</span><span class="cx"> shouldBe("Math.min(-0, 0)", "-0");
</span><ins>+shouldThrow("Math.min(NaN, {valueOf:function(){throw \"err\"}})","'err'");
+shouldThrow("Math.min(NaN, NaN, {valueOf:function(){throw \"err\"}})","'err'");
+shouldBe("Math.min(-0, NaN, 0)", "NaN");
+shouldBe("Math.min(-0, NaN, 0, NaN)", "NaN");
+sideEffect = 0;
+shouldThrow("Math.min({valueOf:function(){throw \"error1\"}}, {valueOf:function(){sideEffect = 1}})", "'error1'")
+shouldBe('sideEffect', '0');
</ins><span class="cx">
</span><span class="cx"> shouldBe("Math.pow(NaN, NaN)", "NaN");
</span><span class="cx"> shouldBe("Math.pow(NaN, 0)", "1");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (164818 => 164819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-27 19:20:08 UTC (rev 164818)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-27 19:39:42 UTC (rev 164819)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-02-27 Tibor Meszaros <tmeszaros.u-szeged@partner.samsung.com>
+
+ Math.{max, min}() must not return after first NaN value
+ https://bugs.webkit.org/show_bug.cgi?id=104147
+
+ Reviewed by Oliver Hunt.
+
+ According to the spec, ToNumber going to be called on each argument
+ even if a `NaN` value was already found
+
+ * runtime/MathObject.cpp:
+ (JSC::mathProtoFuncMax):
+ (JSC::mathProtoFuncMin):
+
</ins><span class="cx"> 2014-02-27 Gergo Balogh <gbalogh.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> JSType upper limit (0xff) assertion can be removed.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeMathObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/MathObject.cpp (164818 => 164819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/MathObject.cpp 2014-02-27 19:20:08 UTC (rev 164818)
+++ trunk/Source/JavaScriptCore/runtime/MathObject.cpp 2014-02-27 19:39:42 UTC (rev 164819)
</span><span class="lines">@@ -188,9 +188,7 @@
</span><span class="cx"> double val = exec->uncheckedArgument(k).toNumber(exec);
</span><span class="cx"> if (std::isnan(val)) {
</span><span class="cx"> result = QNaN;
</span><del>- break;
- }
- if (val > result || (!val && !result && !std::signbit(val)))
</del><ins>+ } else if (val > result || (!val && !result && !std::signbit(val)))
</ins><span class="cx"> result = val;
</span><span class="cx"> }
</span><span class="cx"> return JSValue::encode(jsNumber(result));
</span><span class="lines">@@ -204,9 +202,7 @@
</span><span class="cx"> double val = exec->uncheckedArgument(k).toNumber(exec);
</span><span class="cx"> if (std::isnan(val)) {
</span><span class="cx"> result = QNaN;
</span><del>- break;
- }
- if (val < result || (!val && !result && std::signbit(val)))
</del><ins>+ } else if (val < result || (!val && !result && std::signbit(val)))
</ins><span class="cx"> result = val;
</span><span class="cx"> }
</span><span class="cx"> return JSValue::encode(jsNumber(result));
</span></span></pre>
</div>
</div>
</body>
</html>