[2.4] Fixes for Numeric recursion guard logic in ec800e6.

* coerceBin should not recursion check * RubyFixnum's old override of quo is deleted For #4293.
jruby · Jun 27, 2017 · c2a7ea2 · c2a7ea2
1 parent 8d3b9aa
commit c2a7ea2
Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/core/src/main/java/org/jruby/RubyFixnum.java b/core/src/main/java/org/jruby/RubyFixnum.java
@@ -809,21 +809,6 @@ private IRubyObject divmodFixnum(ThreadContext context, RubyFixnum other) {
         return RubyArray.newArray(runtime, integerDiv, fixMod);
     }
 
-    /** fix_quo
-     *
-     */
-    @Deprecated
-    @Override
-    public IRubyObject quo(ThreadContext context, IRubyObject other) {
-        if (other instanceof RubyFixnum) {
-            return RubyFloat.newFloat(context.runtime, (double) value / (double) ((RubyFixnum) other).value);
-        }
-        if (other instanceof RubyBignum) {
-            return RubyFloat.newFloat(context.runtime, (double) value / ((RubyBignum) other).getDoubleValue());
-        }
-        return coerceBin(context, sites(context).quo, other);
-    }
-
     /** fix_pow
      *
      */

diff --git a/core/src/main/java/org/jruby/RubyNumeric.java b/core/src/main/java/org/jruby/RubyNumeric.java
@@ -554,7 +554,7 @@ protected final IRubyObject coerceBin(ThreadContext context, String method, IRub
     protected final IRubyObject coerceBin(ThreadContext context, CallSite site, IRubyObject other) {
         RubyArray ary = doCoerce(context, other, true);
         IRubyObject car = ary.eltInternal(0);
-        return numFuncall(context, car, site, ary.eltInternal(1));
+        return site.call(context, car, car, ary.eltInternal(1));
     }
 
     /** rb_num_coerce_bit