Changeset 68348 in webkit

Timestamp:

Sep 26, 2010 2:38:31 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-09-26 Mark Hahnenberg <​mhahnenb@gmail.com>

Reviewed by Oliver Hunt.

valueOf called in wrong order in atan2 and date constructors.
​https://bugs.webkit.org/show_bug.cgi?id=26978

Fixed the bug where the arguments to atan2 were being evaluated
out of order.

• runtime/MathObject.cpp: (JSC::mathProtoFuncATan2):

2010-09-26 Mark Hahnenberg <​mhahnenb@gmail.com>

Reviewed by Oliver Hunt.

valueOf called in wrong order in atan2 and date constructors.
​https://bugs.webkit.org/show_bug.cgi?id=26978

Regression test for the issue where the arguments to atan2 were
evaluated out of order.

• fast/js/math-expected.txt:
• fast/js/script-tests/math.js: (v.valueOf): (w.valueOf):

Location:

trunk

Files:

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

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-09-26  Mark Hahnenberg  <mhahnenb@gmail.com>
+
+        Reviewed by Oliver Hunt.
+
+        valueOf called in wrong order in atan2 and date constructors.
+        https://bugs.webkit.org/show_bug.cgi?id=26978
+
+        Fixed the bug where the arguments to atan2 were being evaluated 
+        out of order.
+
+        * runtime/MathObject.cpp:
+        (JSC::mathProtoFuncATan2):
+
 2010-09-26  Mark Hahnenberg  <mhahnenb@gmail.com>
 

trunk/JavaScriptCore/runtime/MathObject.cpp

@@ -136 +136 @@
 EncodedJSValue JSC_HOST_CALL mathProtoFuncATan2(ExecState* exec)
 {
-    return JSValue::encode(jsDoubleNumber(exec, atan2(exec->argument(0).toNumber(exec), exec->argument(1).toNumber(exec))));
+    double arg0 = exec->argument(0).toNumber(exec);
+    double arg1 = exec->argument(1).toNumber(exec);
+    return JSValue::encode(jsDoubleNumber(exec, atan2(arg0, arg1)));
 }
 

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-09-26  Mark Hahnenberg  <mhahnenb@gmail.com>
+
+        Reviewed by Oliver Hunt.
+
+        valueOf called in wrong order in atan2 and date constructors.
+        https://bugs.webkit.org/show_bug.cgi?id=26978
+
+        Regression test for the issue where the arguments to atan2 were
+        evaluated out of order.
+
+        * fast/js/math-expected.txt:
+        * fast/js/script-tests/math.js:
+        (v.valueOf):
+        (w.valueOf):
+
 2010-09-26  Mark Hahnenberg  <mhahnenb@gmail.com>
 

trunk/LayoutTests/fast/js/math-expected.txt

@@ -45 +45 @@
 PASS Math.atan2(Infinity, NaN) is NaN
 PASS Math.atan2(-Infinity, NaN) is NaN
+PASS testStr is "onetwo"
 PASS Math.ceil(NaN) is NaN
 PASS Math.ceil(0) is 0

trunk/LayoutTests/fast/js/script-tests/math.js

@@ -50 +50 @@
 shouldBe("Math.atan2(Infinity, NaN)", "NaN");
 shouldBe("Math.atan2(-Infinity, NaN)", "NaN");
+
+// Regression test for Bug 26978 (https://bugs.webkit.org/show_bug.cgi?id=26978)
+var testStr = "";
+var v = { valueOf: function() { testStr += "one"; return 1; } };
+var w = { valueOf: function() { testStr += "two"; return 2; } };
+Math.atan2(v, w);
+shouldBe('testStr', '\"onetwo\"');
 
 /*