merge revision(s) b176d4f52e4af67654814dab3e9c5f4bf9170e54: [Backport #21008]

	[Bug #21008] Normalize before sum to float

	After switching to `Float`-mode when summing `Numeric` objects,
	normalization for `Float` is still needed.

3 files changed, 17 insertions, 2 deletions

diff --git a/enum.c b/enum.c
index d8a7cb73f3..6e4710fbcb 100644
--- a/enum.c
+++ b/enum.c
@@ -4704,7 +4704,7 @@ sum_iter(VALUE i, struct enum_sum_memo *memo)
     }
     else switch (TYPE(memo->v)) {
       default:      sum_iter_some_value(i, memo);    return;
-      case T_FLOAT: sum_iter_Kahan_Babuska(i, memo); return;
+      case T_FLOAT:
       case T_FIXNUM:
       case T_BIGNUM:
       case T_RATIONAL:
diff --git a/test/ruby/test_enumerator.rb b/test/ruby/test_enumerator.rb
index 7599d43463..cd62cd8acb 100644
--- a/test/ruby/test_enumerator.rb
+++ b/test/ruby/test_enumerator.rb
@@ -1043,4 +1043,19 @@ class TestEnumerator < Test::Unit::TestCase
     assert_raise(FrozenError) { e.feed 1 }
     assert_raise(FrozenError) { e.rewind }
   end
+
+  def test_sum_of_numeric
+    num = Class.new(Numeric) do
+      attr_reader :to_f
+      def initialize(val)
+        @to_f = Float(val)
+      end
+    end
+
+    ary = [5, 10, 20].map {|i| num.new(i)}
+
+    assert_equal(35.0, ary.sum)
+    enum = ary.each
+    assert_equal(35.0, enum.sum)
+  end
 end
diff --git a/version.h b/version.h
index 8954d0897d..1b55a38786 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 11
+#define RUBY_PATCHLEVEL 12
 
 #include "ruby/version.h"
 #include "ruby/internal/abi.h"