Bug 725198: reuse js_DoubleToECMAInt32 for js_DoubleToECMAUint32, r=luke

js/src/jsnum.cpp

@@ -1297,35 +1297,6 @@ ToUint32Slow(JSContext *cx, const Value &v, uint32_t *out)
 
 }  /* namespace js */
 
-uint32_t
-js_DoubleToECMAUint32(jsdouble d)
-{
-    int32_t i;
-    JSBool neg;
-    jsdouble two32;
-
-    if (!JSDOUBLE_IS_FINITE(d))
-        return 0;
-
-    /*
-     * We check whether d fits int32, not uint32, as all but the ">>>" bit
-     * manipulation bytecode stores the result as int, not uint. When the
-     * result does not fit int Value, it will be stored as a negative double.
-     */
-    i = (int32_t) d;
-    if ((jsdouble) i == d)
-        return (int32_t)i;
-
-    neg = (d < 0);
-    d = floor(neg ? -d : d);
-    d = neg ? -d : d;
-
-    two32 = 4294967296.0;
-    d = fmod(d, two32);
-
-    return (uint32_t) (d >= 0 ? d : d + two32);
-}
-
 namespace js {
 
 bool

js/src/jsnum.h

@@ -556,8 +556,11 @@ js_DoubleToECMAInt32(jsdouble d)
 #endif
 }
 
-uint32_t
-js_DoubleToECMAUint32(jsdouble d);
+inline uint32_t
+js_DoubleToECMAUint32(jsdouble d)
+{
+    return uint32_t(js_DoubleToECMAInt32(d));
+}
 
 /*
  * Convert a jsdouble to an integral number, stored in a jsdouble.