Changeset 166413 in webkit

Timestamp:

Mar 28, 2014 10:51:51 AM (10 years ago)

Author:

tonikitoo@webkit.org

Message:

constants are always typed to 'int' ​https://bugs.webkit.org/show_bug.cgi?id=130775

Reviewed by Darin Adler.
Patch by Antonio Gomes <​a1.gomes@sisa.samsung.com>

Patch fixes a bug where all constant getter generated
methods were returning 'integer' values due to static_cast.

Compilers should be smarth enough to properly infer which
jsNumber class construtor to call given a literal value.

Patch also fixes a bug where values whose representation
is bigger an integer maximum were overflowing. For instance,
NodeFilter.SHOW_ALL (0xFFFFFFFF).

Tests:
Binding tests updated.
Rebaselined fast/dom/constants.html

• bindings/scripts/CodeGeneratorJS.pm:

(GenerateImplementation):

• bindings/scripts/test/JS/JSTestInterface.cpp:

(WebCore::jsTestInterfaceIMPLEMENTSCONSTANT1):
(WebCore::jsTestInterfaceIMPLEMENTSCONSTANT2):
(WebCore::jsTestInterfaceSUPPLEMENTALCONSTANT1):
(WebCore::jsTestInterfaceSUPPLEMENTALCONSTANT2):

• bindings/scripts/test/JS/JSTestObj.cpp:

(WebCore::jsTestObjCONDITIONAL_CONST):
(WebCore::jsTestObjCONST_VALUE_0):
(WebCore::jsTestObjCONST_VALUE_1):
(WebCore::jsTestObjCONST_VALUE_2):
(WebCore::jsTestObjCONST_VALUE_4):
(WebCore::jsTestObjCONST_VALUE_8):
(WebCore::jsTestObjCONST_VALUE_9):
(WebCore::jsTestObjCONST_VALUE_11):
(WebCore::jsTestObjCONST_VALUE_12):
(WebCore::jsTestObjCONST_VALUE_13):
(WebCore::jsTestObjCONST_VALUE_14):
(WebCore::jsTestObjCONST_JAVASCRIPT):
(WebCore::jsTestObjReadonly):

Location:

trunk

Files:

• LayoutTests/fast/dom/constants-expected.txt (modified) (2 diffs)
• LayoutTests/fast/dom/constants.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (modified) (2 diffs)
• Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp (modified) (4 diffs)
• Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (modified) (13 diffs)

trunk/LayoutTests/fast/dom/constants-expected.txt

@@ -28 +28 @@
 PASS: nodeFilter.FILTER_REJECT should be 2 and is.
 PASS: nodeFilter.FILTER_SKIP should be 3 and is.
-PASS: nodeFilter.SHOW_ALL should be -1 and is.
+PASS: nodeFilter.SHOW_ALL should be 4294967295 and is.
 PASS: nodeFilter.SHOW_ELEMENT should be 1 and is.
 PASS: nodeFilter.SHOW_ATTRIBUTE should be 2 and is.
@@ -44 +44 @@
 PASS: window.NodeFilter.FILTER_REJECT should be 2 and is.
 PASS: window.NodeFilter.FILTER_SKIP should be 3 and is.
-PASS: window.NodeFilter.SHOW_ALL should be -1 and is.
+PASS: window.NodeFilter.SHOW_ALL should be 4294967295 and is.
 PASS: window.NodeFilter.SHOW_ELEMENT should be 1 and is.
 PASS: window.NodeFilter.SHOW_ATTRIBUTE should be 2 and is.

trunk/LayoutTests/fast/dom/constants.html

@@ -81 +81 @@
     shouldBe("nodeFilter.FILTER_REJECT", 2);
     shouldBe("nodeFilter.FILTER_SKIP", 3);
-    shouldBe("nodeFilter.SHOW_ALL", -1);
+    shouldBe("nodeFilter.SHOW_ALL", 0xFFFFFFFF);
     shouldBe("nodeFilter.SHOW_ELEMENT", 0x00000001);
     shouldBe("nodeFilter.SHOW_ATTRIBUTE", 0x00000002);
@@ -98 +98 @@
     shouldBe("window.NodeFilter.FILTER_REJECT", 2);
     shouldBe("window.NodeFilter.FILTER_SKIP", 3);
-    shouldBe("window.NodeFilter.SHOW_ALL", -1);
+    shouldBe("window.NodeFilter.SHOW_ALL", 0xFFFFFFFF);
     shouldBe("window.NodeFilter.SHOW_ELEMENT", 0x00000001);
     shouldBe("window.NodeFilter.SHOW_ATTRIBUTE", 0x00000002);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-26  Antonio Gomes  <a1.gomes@sisa.samsung.com>
+
+        [Bindings] constants are always typed to 'int'
+        https://bugs.webkit.org/show_bug.cgi?id=130775
+
+        Reviewed by Darin Adler.
+
+        Patch fixes a bug where all constant getter generated
+        methods were returning 'integer' values due to static_cast.
+
+        Compilers should be smarth enough to properly infer which
+        jsNumber class construtor to call given a literal value.
+
+        Patch also fixes a bug where values whose representation
+        is bigger an integer maximum were overflowing. For instance,
+        NodeFilter.SHOW_ALL (0xFFFFFFFF).
+
+        Tests:
+        Binding tests updated.
+        Rebaselined fast/dom/constants.html
+
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateImplementation):
+        * bindings/scripts/test/JS/JSTestInterface.cpp:
+        (WebCore::jsTestInterfaceIMPLEMENTSCONSTANT1):
+        (WebCore::jsTestInterfaceIMPLEMENTSCONSTANT2):
+        (WebCore::jsTestInterfaceSUPPLEMENTALCONSTANT1):
+        (WebCore::jsTestInterfaceSUPPLEMENTALCONSTANT2):
+        * bindings/scripts/test/JS/JSTestObj.cpp:
+        (WebCore::jsTestObjCONDITIONAL_CONST):
+        (WebCore::jsTestObjCONST_VALUE_0):
+        (WebCore::jsTestObjCONST_VALUE_1):
+        (WebCore::jsTestObjCONST_VALUE_2):
+        (WebCore::jsTestObjCONST_VALUE_4):
+        (WebCore::jsTestObjCONST_VALUE_8):
+        (WebCore::jsTestObjCONST_VALUE_9):
+        (WebCore::jsTestObjCONST_VALUE_11):
+        (WebCore::jsTestObjCONST_VALUE_12):
+        (WebCore::jsTestObjCONST_VALUE_13):
+        (WebCore::jsTestObjCONST_VALUE_14):
+        (WebCore::jsTestObjCONST_JAVASCRIPT):
+        (WebCore::jsTestObjReadonly):
+
 2014-03-28  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -2822 +2822 @@
             }
 
-            # FIXME: this casts into int to match our previous behavior which turned 0xFFFFFFFF in -1 for NodeFilter.SHOW_ALL
             push(@implContent, "EncodedJSValue ${getter}(ExecState* exec, JSObject*, EncodedJSValue, PropertyName)\n");
             push(@implContent, "{\n");
@@ -2829 +2828 @@
             } else {
                 push(@implContent, "    UNUSED_PARAM(exec);\n");
-                push(@implContent, "    return JSValue::encode(jsNumber(static_cast<int>(" . $constant->value . ")));\n");
+                push(@implContent, "    return JSValue::encode(jsNumber(" . $constant->value . "));\n");
             }
             push(@implContent, "}\n\n");

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp

@@ -933 +933 @@
 {
     UNUSED_PARAM(exec);
-    return JSValue::encode(jsNumber(static_cast<int>(1)));
+    return JSValue::encode(jsNumber(1));
 }
 
@@ -941 +941 @@
 {
     UNUSED_PARAM(exec);
-    return JSValue::encode(jsNumber(static_cast<int>(2)));
+    return JSValue::encode(jsNumber(2));
 }
 
@@ -949 +949 @@
 {
     UNUSED_PARAM(exec);
-    return JSValue::encode(jsNumber(static_cast<int>(1)));
+    return JSValue::encode(jsNumber(1));
 }
 
@@ -957 +957 @@
 {
     UNUSED_PARAM(exec);
-    return JSValue::encode(jsNumber(static_cast<int>(2)));
+    return JSValue::encode(jsNumber(2));
 }
 

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp

@@ -4690 +4690 @@
 {
     UNUSED_PARAM(exec);
-    return JSValue::encode(jsNumber(static_cast<int>(0)));
+    return JSValue::encode(jsNumber(0));
 }
 
@@ -4697 +4697 @@
 {
     UNUSED_PARAM(exec);
-    return JSValue::encode(jsNumber(static_cast<int>(0)));
+    return JSValue::encode(jsNumber(0));
 }
 
@@ -4703 +4703 @@
 {
     UNUSED_PARAM(exec);
-    return JSValue::encode(jsNumber(static_cast<int>(1)));
+    return JSValue::encode(jsNumber(1));
 }
 
@@ -4709 +4709 @@
 {
     UNUSED_PARAM(exec);
-    return JSValue::encode(jsNumber(static_cast<int>(2)));
+    return JSValue::encode(jsNumber(2));
 }
 
@@ -4715 +4715 @@
 {
     UNUSED_PARAM(exec);
-    return JSValue::encode(jsNumber(static_cast<int>(4)));
+    return JSValue::encode(jsNumber(4));
 }
 
@@ -4721 +4721 @@
 {
     UNUSED_PARAM(exec);
-    return JSValue::encode(jsNumber(static_cast<int>(8)));
+    return JSValue::encode(jsNumber(8));
 }
 
@@ -4727 +4727 @@
 {
     UNUSED_PARAM(exec);
-    return JSValue::encode(jsNumber(static_cast<int>(-1)));
+    return JSValue::encode(jsNumber(-1));
 }
 
@@ -4738 +4738 @@
 {
     UNUSED_PARAM(exec);
-    return JSValue::encode(jsNumber(static_cast<int>(0xffffffff)));
+    return JSValue::encode(jsNumber(0xffffffff));
 }
 
@@ -4744 +4744 @@
 {
     UNUSED_PARAM(exec);
-    return JSValue::encode(jsNumber(static_cast<int>(0x01)));
+    return JSValue::encode(jsNumber(0x01));
 }
 
@@ -4750 +4750 @@
 {
     UNUSED_PARAM(exec);
-    return JSValue::encode(jsNumber(static_cast<int>(0X20)));
+    return JSValue::encode(jsNumber(0X20));
 }
 
@@ -4756 +4756 @@
 {
     UNUSED_PARAM(exec);
-    return JSValue::encode(jsNumber(static_cast<int>(0x1abc)));
+    return JSValue::encode(jsNumber(0x1abc));
 }
 
@@ -4762 +4762 @@
 {
     UNUSED_PARAM(exec);
-    return JSValue::encode(jsNumber(static_cast<int>(15)));
+    return JSValue::encode(jsNumber(15));
 }
 
@@ -4768 +4768 @@
 {
     UNUSED_PARAM(exec);
-    return JSValue::encode(jsNumber(static_cast<int>(0)));
+    return JSValue::encode(jsNumber(0));
 }