Title: [184082] releases/WebKitGTK/webkit-2.8
Revision
184082
Author
[email protected]
Date
2015-05-11 05:05:49 -0700 (Mon, 11 May 2015)

Log Message

Merge r182868 - Math.imul has wrong length in Safari 8.0.4
https://bugs.webkit.org/show_bug.cgi?id=143658

Patch by Jordan Harband <[email protected]> on 2015-04-15
Reviewed by Benjamin Poulain.

Source/_javascript_Core:

Correcting function length from 1, to 2, to match spec
https://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.imul

* runtime/MathObject.cpp:
(JSC::MathObject::finishCreation):

LayoutTests:

* js/script-tests/math.js:

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog (184081 => 184082)


--- releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog	2015-05-11 12:01:21 UTC (rev 184081)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog	2015-05-11 12:05:49 UTC (rev 184082)
@@ -1,5 +1,14 @@
 2015-04-15  Jordan Harband  <[email protected]>
 
+        Math.imul has wrong length in Safari 8.0.4
+        https://bugs.webkit.org/show_bug.cgi?id=143658
+
+        Reviewed by Benjamin Poulain.
+
+        * js/script-tests/math.js:
+
+2015-04-15  Jordan Harband  <[email protected]>
+
         Number.parseInt in nightly r182673 has wrong length
         https://bugs.webkit.org/show_bug.cgi?id=143657
 

Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/js/math-expected.txt (184081 => 184082)


--- releases/WebKitGTK/webkit-2.8/LayoutTests/js/math-expected.txt	2015-05-11 12:01:21 UTC (rev 184081)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/js/math-expected.txt	2015-05-11 12:05:49 UTC (rev 184082)
@@ -102,6 +102,7 @@
 PASS Math.hypot({valueOf:function(){throw "error1"}}, {valueOf:function(){sideEffect = 1}}) threw exception error1.
 PASS sideEffect is 0
 PASS Math.hypot(3, 4, 'foo') is NaN
+PASS Math.imul.length is 2
 PASS Math.log(NaN) is NaN
 PASS Math.log(0) is -Infinity
 PASS Math.log(-0) is -Infinity

Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/js/script-tests/math.js (184081 => 184082)


--- releases/WebKitGTK/webkit-2.8/LayoutTests/js/script-tests/math.js	2015-05-11 12:01:21 UTC (rev 184081)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/js/script-tests/math.js	2015-05-11 12:05:49 UTC (rev 184082)
@@ -145,6 +145,8 @@
 shouldBe('sideEffect', '0');
 shouldBe("Math.hypot(3, 4, 'foo')", "NaN");
 
+shouldBe("Math.imul.length", "2");
+
 shouldBe("Math.log(NaN)", "NaN");
 shouldBe("Math.log(0)", "-Infinity");
 shouldBe("Math.log(-0)", "-Infinity");

Modified: releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/ChangeLog (184081 => 184082)


--- releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/ChangeLog	2015-05-11 12:01:21 UTC (rev 184081)
+++ releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/ChangeLog	2015-05-11 12:05:49 UTC (rev 184082)
@@ -1,11 +1,24 @@
 2015-04-15  Jordan Harband  <[email protected]>
 
+        Math.imul has wrong length in Safari 8.0.4
+        https://bugs.webkit.org/show_bug.cgi?id=143658
+
+        Reviewed by Benjamin Poulain.
+
+        Correcting function length from 1, to 2, to match spec
+        https://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.imul
+
+        * runtime/MathObject.cpp:
+        (JSC::MathObject::finishCreation):
+
+2015-04-15  Jordan Harband  <[email protected]>
+
         Number.parseInt in nightly r182673 has wrong length
         https://bugs.webkit.org/show_bug.cgi?id=143657
 
         Reviewed by Benjamin Poulain.
 
-        Correcting funciton length from 1, to 2, to match spec
+        Correcting function length from 1, to 2, to match spec
         https://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.parseint
 
         * runtime/NumberConstructor.cpp:

Modified: releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/runtime/MathObject.cpp (184081 => 184082)


--- releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/runtime/MathObject.cpp	2015-05-11 12:01:21 UTC (rev 184081)
+++ releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/runtime/MathObject.cpp	2015-05-11 12:05:49 UTC (rev 184082)
@@ -129,7 +129,7 @@
     putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier(&vm, "tan"), 1, mathProtoFuncTan, NoIntrinsic, DontEnum | Function);
     putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier(&vm, "tanh"), 1, mathProtoFuncTanh, NoIntrinsic, DontEnum | Function);
     putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier(&vm, "trunc"), 1, mathProtoFuncTrunc, NoIntrinsic, DontEnum | Function);
-    putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier(&vm, "imul"), 1, mathProtoFuncIMul, IMulIntrinsic, DontEnum | Function);
+    putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier(&vm, "imul"), 2, mathProtoFuncIMul, IMulIntrinsic, DontEnum | Function);
 }
 
 // ------------------------------ Functions --------------------------------
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to