<!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>[181556] 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/181556">181556</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-16 08:45:54 -0700 (Mon, 16 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update Map/Set to treat -0 and 0 as the same value
https://bugs.webkit.org/show_bug.cgi?id=142709
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-03-16
Reviewed by Csaba Osztrogonác.
Source/JavaScriptCore:
* runtime/MapData.h:
(JSC::MapDataImpl<Entry>::KeyType::KeyType):
No longer special case -0. It will be treated as the same as 0.
LayoutTests:
* js/basic-map-expected.txt:
* js/basic-set-expected.txt:
* js/script-tests/basic-map.js:
* js/script-tests/basic-set.js:
Update tests now that -0 and 0 are treated the same.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsbasicmapexpectedtxt">trunk/LayoutTests/js/basic-map-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsbasicsetexpectedtxt">trunk/LayoutTests/js/basic-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsbasicmapjs">trunk/LayoutTests/js/script-tests/basic-map.js</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsbasicsetjs">trunk/LayoutTests/js/script-tests/basic-set.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeMapDatah">trunk/Source/JavaScriptCore/runtime/MapData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (181555 => 181556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-03-16 14:58:26 UTC (rev 181555)
+++ trunk/LayoutTests/ChangeLog 2015-03-16 15:45:54 UTC (rev 181556)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-03-16 Joseph Pecoraro <pecoraro@apple.com>
+
+ Update Map/Set to treat -0 and 0 as the same value
+ https://bugs.webkit.org/show_bug.cgi?id=142709
+
+ Reviewed by Csaba Osztrogonác.
+
+ * js/basic-map-expected.txt:
+ * js/basic-set-expected.txt:
+ * js/script-tests/basic-map.js:
+ * js/script-tests/basic-set.js:
+ Update tests now that -0 and 0 are treated the same.
+
</ins><span class="cx"> 2015-03-16 Max Stepin <maxstepin@gmail.com>
</span><span class="cx">
</span><span class="cx"> Add APNG support
</span></span></pre></div>
<a id="trunkLayoutTestsjsbasicmapexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/basic-map-expected.txt (181555 => 181556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/basic-map-expected.txt 2015-03-16 14:58:26 UTC (rev 181555)
+++ trunk/LayoutTests/js/basic-map-expected.txt 2015-03-16 15:45:54 UTC (rev 181556)
</span><span class="lines">@@ -37,13 +37,14 @@
</span><span class="cx"> PASS map.size is 0
</span><span class="cx"> PASS map.set(-0, 1) is map
</span><span class="cx"> PASS map.set(0, 2) is map
</span><ins>+PASS map.size is 1
</ins><span class="cx"> PASS map.set(Infinity, 3) is map
</span><span class="cx"> PASS map.set(-Infinity, 4) is map
</span><span class="cx"> PASS map.set(NaN, 5) is map
</span><span class="cx"> PASS map.set('0', 6) is map
</span><span class="cx"> PASS map.set(0.1, 7) is map
</span><del>-PASS map.size is 7
-PASS map.get(-0) is 1
</del><ins>+PASS map.size is 6
+PASS map.get(-0) is 2
</ins><span class="cx"> PASS map.get(0) is 2
</span><span class="cx"> PASS map.get(Infinity) is 3
</span><span class="cx"> PASS map.get(-Infinity) is 4
</span><span class="lines">@@ -58,7 +59,7 @@
</span><span class="cx"> PASS map.has('0') is true
</span><span class="cx"> PASS map.has(0.1) is true
</span><span class="cx"> PASS map.delete(-0) is true
</span><del>-PASS map.delete(0) is true
</del><ins>+PASS map.delete(0) is false
</ins><span class="cx"> PASS map.delete(Infinity) is true
</span><span class="cx"> PASS map.delete(-Infinity) is true
</span><span class="cx"> PASS map.delete(NaN) is true
</span></span></pre></div>
<a id="trunkLayoutTestsjsbasicsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/basic-set-expected.txt (181555 => 181556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/basic-set-expected.txt 2015-03-16 14:58:26 UTC (rev 181555)
+++ trunk/LayoutTests/js/basic-set-expected.txt 2015-03-16 15:45:54 UTC (rev 181556)
</span><span class="lines">@@ -46,12 +46,13 @@
</span><span class="cx"> PASS set.size is 0
</span><span class="cx"> PASS set.add(-0) is set
</span><span class="cx"> PASS set.add(0) is set
</span><ins>+PASS set.size is 1
</ins><span class="cx"> PASS set.add(Infinity) is set
</span><span class="cx"> PASS set.add(-Infinity) is set
</span><span class="cx"> PASS set.add(NaN) is set
</span><span class="cx"> PASS set.add('0') is set
</span><span class="cx"> PASS set.add(0.1) is set
</span><del>-PASS set.size is 7
</del><ins>+PASS set.size is 6
</ins><span class="cx"> PASS set.has(-0) is true
</span><span class="cx"> PASS set.has(0) is true
</span><span class="cx"> PASS set.has(Infinity) is true
</span><span class="lines">@@ -60,7 +61,7 @@
</span><span class="cx"> PASS set.has('0') is true
</span><span class="cx"> PASS set.has(0.1) is true
</span><span class="cx"> PASS set.delete(-0) is true
</span><del>-PASS set.delete(0) is true
</del><ins>+PASS set.delete(0) is false
</ins><span class="cx"> PASS set.delete(Infinity) is true
</span><span class="cx"> PASS set.delete(-Infinity) is true
</span><span class="cx"> PASS set.delete(NaN) is true
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsbasicmapjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/basic-map.js (181555 => 181556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/basic-map.js 2015-03-16 14:58:26 UTC (rev 181555)
+++ trunk/LayoutTests/js/script-tests/basic-map.js 2015-03-16 15:45:54 UTC (rev 181556)
</span><span class="lines">@@ -41,13 +41,14 @@
</span><span class="cx"> shouldBe("map.size", "0")
</span><span class="cx"> shouldBe("map.set(-0, 1)", "map")
</span><span class="cx"> shouldBe("map.set(0, 2)", "map")
</span><ins>+shouldBe("map.size", "1")
</ins><span class="cx"> shouldBe("map.set(Infinity, 3)", "map")
</span><span class="cx"> shouldBe("map.set(-Infinity, 4)", "map")
</span><span class="cx"> shouldBe("map.set(NaN, 5)", "map")
</span><span class="cx"> shouldBe("map.set('0', 6)", "map")
</span><span class="cx"> shouldBe("map.set(0.1, 7)", "map")
</span><del>-shouldBe("map.size", "7")
-shouldBe("map.get(-0)", "1")
</del><ins>+shouldBe("map.size", "6")
+shouldBe("map.get(-0)", "2")
</ins><span class="cx"> shouldBe("map.get(0)", "2")
</span><span class="cx"> shouldBe("map.get(Infinity)", "3")
</span><span class="cx"> shouldBe("map.get(-Infinity)", "4")
</span><span class="lines">@@ -64,7 +65,7 @@
</span><span class="cx"> shouldBeTrue("map.has(0.1)")
</span><span class="cx">
</span><span class="cx"> shouldBeTrue("map.delete(-0)")
</span><del>-shouldBeTrue("map.delete(0)")
</del><ins>+shouldBeFalse("map.delete(0)")
</ins><span class="cx"> shouldBeTrue("map.delete(Infinity)")
</span><span class="cx"> shouldBeTrue("map.delete(-Infinity)")
</span><span class="cx"> shouldBeTrue("map.delete(NaN)")
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsbasicsetjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/basic-set.js (181555 => 181556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/basic-set.js 2015-03-16 14:58:26 UTC (rev 181555)
+++ trunk/LayoutTests/js/script-tests/basic-set.js 2015-03-16 15:45:54 UTC (rev 181556)
</span><span class="lines">@@ -48,12 +48,13 @@
</span><span class="cx"> shouldBe("set.size", "0")
</span><span class="cx"> shouldBe("set.add(-0)", "set")
</span><span class="cx"> shouldBe("set.add(0)", "set")
</span><ins>+shouldBe("set.size", "1")
</ins><span class="cx"> shouldBe("set.add(Infinity)", "set")
</span><span class="cx"> shouldBe("set.add(-Infinity)", "set")
</span><span class="cx"> shouldBe("set.add(NaN)", "set")
</span><span class="cx"> shouldBe("set.add('0')", "set")
</span><span class="cx"> shouldBe("set.add(0.1)", "set")
</span><del>-shouldBe("set.size", "7")
</del><ins>+shouldBe("set.size", "6")
</ins><span class="cx">
</span><span class="cx"> shouldBeTrue("set.has(-0)")
</span><span class="cx"> shouldBeTrue("set.has(0)")
</span><span class="lines">@@ -64,7 +65,7 @@
</span><span class="cx"> shouldBeTrue("set.has(0.1)")
</span><span class="cx">
</span><span class="cx"> shouldBeTrue("set.delete(-0)")
</span><del>-shouldBeTrue("set.delete(0)")
</del><ins>+shouldBeFalse("set.delete(0)")
</ins><span class="cx"> shouldBeTrue("set.delete(Infinity)")
</span><span class="cx"> shouldBeTrue("set.delete(-Infinity)")
</span><span class="cx"> shouldBeTrue("set.delete(NaN)")
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (181555 => 181556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-03-16 14:58:26 UTC (rev 181555)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-03-16 15:45:54 UTC (rev 181556)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-03-16 Joseph Pecoraro <pecoraro@apple.com>
+
+ Update Map/Set to treat -0 and 0 as the same value
+ https://bugs.webkit.org/show_bug.cgi?id=142709
+
+ Reviewed by Csaba Osztrogonác.
+
+ * runtime/MapData.h:
+ (JSC::MapDataImpl<Entry>::KeyType::KeyType):
+ No longer special case -0. It will be treated as the same as 0.
+
</ins><span class="cx"> 2015-03-15 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Better handle displaying -0
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeMapDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/MapData.h (181555 => 181556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/MapData.h 2015-03-16 14:58:26 UTC (rev 181555)
+++ trunk/Source/JavaScriptCore/runtime/MapData.h 2015-03-16 15:45:54 UTC (rev 181556)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> double d = v.asDouble();
</span><del>- if (std::isnan(d) || (std::signbit(d) && d == 0.0)) {
</del><ins>+ if (std::isnan(d)) {
</ins><span class="cx"> value = v;
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>