Changeset 181556 in webkit

Timestamp:

Mar 16, 2015, 8:45:54 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

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 <Joseph Pecoraro> 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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/basic-map-expected.txt (modified) (3 diffs)
• LayoutTests/js/basic-set-expected.txt (modified) (3 diffs)
• LayoutTests/js/script-tests/basic-map.js (modified) (3 diffs)
• LayoutTests/js/script-tests/basic-set.js (modified) (3 diffs)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/MapData.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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.
+
 2015-03-16  Max Stepin  <maxstepin@gmail.com>
 

trunk/LayoutTests/js/basic-map-expected.txt

@@ -38 +38 @@
 PASS map.set(-0, 1) is map
 PASS map.set(0, 2) is map
+PASS map.size is 1
 PASS map.set(Infinity, 3) is map
 PASS map.set(-Infinity, 4) is map
@@ -43 +44 @@
 PASS map.set('0', 6) is map
 PASS map.set(0.1, 7) is map
-PASS map.size is 7
-PASS map.get(-0) is 1
+PASS map.size is 6
+PASS map.get(-0) is 2
 PASS map.get(0) is 2
 PASS map.get(Infinity) is 3
@@ -59 +60 @@
 PASS map.has(0.1) is true
 PASS map.delete(-0) is true
-PASS map.delete(0) is true
+PASS map.delete(0) is false
 PASS map.delete(Infinity) is true
 PASS map.delete(-Infinity) is true

trunk/LayoutTests/js/basic-set-expected.txt

@@ -47 +47 @@
 PASS set.add(-0) is set
 PASS set.add(0) is set
+PASS set.size is 1
 PASS set.add(Infinity) is set
 PASS set.add(-Infinity) is set
@@ -52 +53 @@
 PASS set.add('0') is set
 PASS set.add(0.1) is set
-PASS set.size is 7
+PASS set.size is 6
 PASS set.has(-0) is true
 PASS set.has(0) is true
@@ -61 +62 @@
 PASS set.has(0.1) is true
 PASS set.delete(-0) is true
-PASS set.delete(0) is true
+PASS set.delete(0) is false
 PASS set.delete(Infinity) is true
 PASS set.delete(-Infinity) is true

trunk/LayoutTests/js/script-tests/basic-map.js

@@ -42 +42 @@
 shouldBe("map.set(-0, 1)", "map")
 shouldBe("map.set(0, 2)", "map")
+shouldBe("map.size", "1")
 shouldBe("map.set(Infinity, 3)", "map")
 shouldBe("map.set(-Infinity, 4)", "map")
@@ -47 +48 @@
 shouldBe("map.set('0', 6)", "map")
 shouldBe("map.set(0.1, 7)", "map")
-shouldBe("map.size", "7")
-shouldBe("map.get(-0)", "1")
+shouldBe("map.size", "6")
+shouldBe("map.get(-0)", "2")
 shouldBe("map.get(0)", "2")
 shouldBe("map.get(Infinity)", "3")
@@ -65 +66 @@
 
 shouldBeTrue("map.delete(-0)")
-shouldBeTrue("map.delete(0)")
+shouldBeFalse("map.delete(0)")
 shouldBeTrue("map.delete(Infinity)")
 shouldBeTrue("map.delete(-Infinity)")

trunk/LayoutTests/js/script-tests/basic-set.js

@@ -49 +49 @@
 shouldBe("set.add(-0)", "set")
 shouldBe("set.add(0)", "set")
+shouldBe("set.size", "1")
 shouldBe("set.add(Infinity)", "set")
 shouldBe("set.add(-Infinity)", "set")
@@ -54 +55 @@
 shouldBe("set.add('0')", "set")
 shouldBe("set.add(0.1)", "set")
-shouldBe("set.size", "7")
+shouldBe("set.size", "6")
 
 shouldBeTrue("set.has(-0)")
@@ -65 +66 @@
 
 shouldBeTrue("set.delete(-0)")
-shouldBeTrue("set.delete(0)")
+shouldBeFalse("set.delete(0)")
 shouldBeTrue("set.delete(Infinity)")
 shouldBeTrue("set.delete(-Infinity)")

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+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.
+
 2015-03-15  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/JavaScriptCore/runtime/MapData.h

@@ -153 +153 @@
     }
     double d = v.asDouble();
-    if (std::isnan(d) || (std::signbit(d) && d == 0.0)) {
+    if (std::isnan(d)) {
         value = v;
         return;