Backed out changeset 973ede87dcdd (bug 1092547) for jit-test timeouts in bug977966.js.

CLOSED TREE

js/src/jit-test/tests/ion/dce-with-rinstructions.js

@@ -1077,25 +1077,6 @@ function rsin_object(i) {
     return i;
 }
 
-var uceFault_log_number = eval(uneval(uceFault).replace('uceFault', 'uceFault_log_number'));
-function rlog_number(i) {
-    var x = Math.log(i);
-    if (uceFault_log_number(i) || uceFault_log_number(i))
-        assertEq(x, Math.log(99) /* log(99) */);
-    return i;
-}
-
-var uceFault_log_object = eval(uneval(uceFault).replace('uceFault', 'uceFault_log_object'));
-function rlog_object(i) {
-    var t = i;
-    var o = { valueOf: function() { return t; } };
-    var x = Math.log(o); /* Evaluated with t == i, not t == 1000 */
-    t = 1000;
-    if (uceFault_log_object(i) || uceFault_log_object(i))
-        assertEq(x, Math.log(99) /* log(99) */);
-    return i;
-}
-
 for (i = 0; i < 100; i++) {
     rbitnot_number(i);
     rbitnot_object(i);
@@ -1199,8 +1180,6 @@ for (i = 0; i < 100; i++) {
     rhypot_object(i);
     rsin_number(i);
     rsin_object(i);
-    rlog_number(i);
-    rlog_object(i);
 }
 
 // Test that we can refer multiple time to the same recover instruction, as well

js/src/jit/MIR.h

@@ -5716,7 +5716,6 @@ class MMathFunction
     bool canRecoverOnBailout() const MOZ_OVERRIDE {
         switch(function_) {
           case Sin:
-          case Log:
           case Round:
             return true;
           default:

js/src/jit/Recover.cpp

@@ -910,7 +910,6 @@ MMathFunction::writeRecoverData(CompactBufferWriter &writer) const
         writer.writeUnsigned(uint32_t(RInstruction::Recover_Round));
         return true;
       case Sin:
-      case Log:
         writer.writeUnsigned(uint32_t(RInstruction::Recover_MathFunction));
         writer.writeByte(function_);
         return true;
@@ -938,16 +937,6 @@ RMathFunction::recover(JSContext *cx, SnapshotIterator &iter) const
         iter.storeInstructionResult(result);
         return true;
       }
-      case MMathFunction::Log: {
-        RootedValue arg(cx, iter.read());
-        RootedValue result(cx);
-
-        if (!js::math_log_handle(cx, arg, &result))
-            return false;
-
-        iter.storeInstructionResult(result);
-        return true;
-      }
       default:
         MOZ_CRASH("Unknown math function.");
     }

js/src/jsmath.cpp

@@ -525,7 +525,7 @@ double
 js::math_log_impl(MathCache *cache, double x)
 {
     LOG_IF_OUT_OF_RANGE(x);
-    return cache->lookup(math_log_uncached, x, MathCache::Log);
+    return cache->lookup(log, x, MathCache::Log);
 }
 
 double
@@ -537,22 +537,6 @@ js::math_log_uncached(double x)
 
 #undef LOG_IF_OUT_OF_RANGE
 
-bool
-js::math_log_handle(JSContext *cx, HandleValue val, MutableHandleValue res)
-{
-    double in;
-    if (!ToNumber(cx, val, &in))
-        return false;
-
-    MathCache *mathCache = cx->runtime()->getMathCache(cx);
-    if (!mathCache)
-        return false;
-
-    double out = math_log_impl(mathCache, in);
-    res.setNumber(out);
-    return true;
-}
-
 bool
 js::math_log(JSContext *cx, unsigned argc, Value *vp)
 {
@@ -563,7 +547,17 @@ js::math_log(JSContext *cx, unsigned argc, Value *vp)
         return true;
     }
 
-    return math_log_handle(cx, args[0], args.rval());
+    double x;
+    if (!ToNumber(cx, args[0], &x))
+        return false;
+
+    MathCache *mathCache = cx->runtime()->getMathCache(cx);
+    if (!mathCache)
+        return false;
+
+    double z = math_log_impl(mathCache, x);
+    args.rval().setNumber(z);
+    return true;
 }
 
 double

js/src/jsmath.h

@@ -170,9 +170,6 @@ math_log_impl(MathCache *cache, double x);
 extern double
 math_log_uncached(double x);
 
-extern bool
-math_log_handle(JSContext *cx, HandleValue val, MutableHandleValue res);
-
 extern bool
 math_sin(JSContext *cx, unsigned argc, js::Value *vp);