Backed out changeset 774d6d582f40 (bug 897027) for assertions

js/src/jsmath.cpp

@@ -293,7 +293,7 @@ js::math_atan2(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    if (args.length() == 0) {
+    if (args.length() <= 1) {
         args.rval().setNaN();
         return true;
     }
@@ -638,7 +638,7 @@ js_math_pow(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    if (args.length() == 0) {
+    if (args.length() <= 1) {
         args.rval().setNaN();
         return true;
     }

js/src/tests/ecma_6/Math/20.2.2.ToNumber.js

@@ -1,114 +0,0 @@
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- */
-
-/*
- *   20.2.2 Function Properties of the Math Object
- *
- *   Each of the following Math object functions applies the ToNumber abstract operation
- *   to each of its arguments (in left-to-right order if there is more than one).
- *   If ToNumber returns an abrupt completion, that completion record is immediately returned.
- *   Otherwise, the function performs a computation on the resulting Number value(s).
- */
-
-/*
- * This custom object will allow us to check if valueOf() is called
- */
-
-TestNumber.prototype = new Number();
-
-function TestNumber(value) {
-    this.value = value;
-    this.valueOfCalled = false;
-}
-
-TestNumber.prototype = {
-    valueOf: function() {
-        this.valueOfCalled = true;
-        return this.value;
-    }
-}
-
-// Verify that each TestNumber's flag is set after calling Math func
-function test(func /*, args */) {
-    var args = Array.prototype.slice.call(arguments, 1);
-    func.apply(null, args);
-
-    for (var i = 0; i < args.length; ++i)
-        assertEq(args[i].valueOfCalled, true);
-}
-
-// Note that we are not testing these functions' return values
-// We only test whether valueOf() is called for each argument
-
-// 1. Test Math.atan2()
-var y = new TestNumber(1);
-test(Math.atan2, y);
-
-var x = new TestNumber(1);
-var y = new TestNumber(2);
-test(Math.atan2, y, x);
-
-// Remove comment block once patch for bug 896264 is approved
-/*
-// 2. Test Math.hypot()
-var x = new TestNumber(1);
-test(Math.hypot, x);
-
-var x = new TestNumber(1);
-var y = new TestNumber(2);
-test(Math.hypot, x, y);
-
-var x = new TestNumber(1);
-var y = new TestNumber(2);
-var z = new TestNumber(3);
-test(Math.hypot, x, y, z);
-*/
-
-// Remove comment block once patch for bug 808148 is approved
-/*
-// 3. Test Math.imul()
-var x = new TestNumber(1);
-test(Math.imul, x);
-
-var x = new TestNumber(1);
-var y = new TestNumber(2);
-test(Math.imul, x, y);
-*/
-
-// 4. Test Math.max()
-var x = new TestNumber(1);
-test(Math.max, x);
-
-var x = new TestNumber(1);
-var y = new TestNumber(2);
-test(Math.max, x, y);
-
-var x = new TestNumber(1);
-var y = new TestNumber(2);
-var z = new TestNumber(3);
-test(Math.max, x, y, z);
-
-// 5. Test Math.min()
-var x = new TestNumber(1);
-test(Math.min, x);
-
-var x = new TestNumber(1);
-var y = new TestNumber(2);
-test(Math.min, x, y);
-
-var x = new TestNumber(1);
-var y = new TestNumber(2);
-var z = new TestNumber(3);
-test(Math.min, x, y, z);
-
-// 6. Test Math.pow()
-var x = new TestNumber(1);
-test(Math.pow, x);
-
-var x = new TestNumber(1);
-var y = new TestNumber(2);
-test(Math.pow, x, y);
-
-reportCompare(0, 0, "ok");