Changeset 184082 in webkit

Timestamp:

May 11, 2015, 5:05:49 AM (11 years ago)

Author:

Carlos Garcia Campos

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 <​ljharb@gmail.com> on 2015-04-15
Reviewed by Benjamin Poulain.

Source/JavaScriptCore:

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:

Location:

releases/WebKitGTK/webkit-2.8

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/math-expected.txt (modified) (1 diff)
• LayoutTests/js/script-tests/math.js (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (2 diffs)
• Source/JavaScriptCore/runtime/MathObject.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog

@@ +1 @@
+2015-04-15  Jordan Harband  <ljharb@gmail.com>
+
+        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  <ljharb@gmail.com>
 

releases/WebKitGTK/webkit-2.8/LayoutTests/js/math-expected.txt

@@ -103 +103 @@
 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

releases/WebKitGTK/webkit-2.8/LayoutTests/js/script-tests/math.js

@@ -145 +145 @@
 shouldBe('sideEffect', '0');
 shouldBe("Math.hypot(3, 4, 'foo')", "NaN");
+
+shouldBe("Math.imul.length", "2");
 
 shouldBe("Math.log(NaN)", "NaN");

releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-04-15  Jordan Harband  <ljharb@gmail.com>
+
+        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  <ljharb@gmail.com>
 
@@ -6 +19 @@
         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
 

releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/runtime/MathObject.cpp

@@ -130 +130 @@
     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);
 }