* enum.c (ary_inject_op): put subtract operation out of if-clause.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54238 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 3dee449135..64fc8e8104 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Mar 23 21:48:00 2016  Kenta Murata  <[email protected]>
+
+	* enum.c (ary_inject_op): put subtract operation out of if-clause.
+
 Wed Mar 23 21:38:00 2016  Kenta Murata  <[email protected]>
 
 	* enum.c (ary_inject_op): Use Kahan's compensated summation algorithm
diff --git a/enum.c b/enum.c
index e6ca6ab0fc..23e4f5a5e4 100644
--- a/enum.c
+++ b/enum.c
@@ -688,17 +688,18 @@ ary_inject_op(VALUE ary, VALUE init, VALUE op)
           sum_float:
             c = 0.0;
             while (1) {
-                double y, t;
+                double x, y, t;
                 e = RARRAY_AREF(ary, i);
                 if (RB_FLOAT_TYPE_P(e))
-                    y = RFLOAT_VALUE(e) - c;
+                    x = RFLOAT_VALUE(e);
                 else if (FIXNUM_P(e))
-                    y = FIX2LONG(e) - c;
+                    x = FIX2LONG(e);
                 else if (RB_TYPE_P(e, T_BIGNUM))
-                    y = rb_big2dbl(e) - c;
+                    x = rb_big2dbl(e);
                 else
                     break;
 
+                y = x - c;
                 t = f + y;
                 c = (t - f) - y;
                 f = t;