vm_insnhelper.c: search in the indexing order

* vm_insnhelper.c (vm_opt_newarray_max, vm_opt_newarray_min):
  search in the indexing order, as well as usual methods.
  [ruby-core:84821] [Bug #14350]

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

2 files changed, 20 insertions, 10 deletions

diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb
index 7e63623b7d..955121c0f0 100644
--- a/test/ruby/test_array.rb
+++ b/test/ruby/test_array.rb
@@ -1631,6 +1631,12 @@ class TestArray < Test::Unit::TestCase
                  ary.min(2) {|a,b| a.length <=> b.length })
     assert_equal([13, 14], [20, 32, 32, 21, 30, 25, 29, 13, 14].min(2))
     assert_equal([2, 4, 6, 7], [2, 4, 8, 6, 7].min(4))
+
+    class << (obj = Object.new)
+      def <=>(x) 1 <=> x end
+      def coerce(x) [x, 1] end
+    end
+    assert_same(obj, [obj, 1.0].min)
   end
 
   def test_max
@@ -1646,6 +1652,12 @@ class TestArray < Test::Unit::TestCase
     assert_equal(%w[albatross horse],
                  ary.max(2) {|a,b| a.length <=> b.length })
     assert_equal([3, 2], [0, 0, 0, 0, 0, 0, 1, 3, 2].max(2))
+
+    class << (obj = Object.new)
+      def <=>(x) 1 <=> x end
+      def coerce(x) [x, 1] end
+    end
+    assert_same(obj, [obj, 1.0].max)
   end
 
   def test_uniq
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index c66ed6d712..f68d34d93a 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -3206,16 +3206,15 @@ vm_opt_newarray_max(rb_num_t num, const VALUE *ptr)
 	}
 	else {
 	    struct cmp_opt_data cmp_opt = { 0, 0 };
-	    VALUE result = Qundef;
+	    VALUE result = *ptr;
 	    rb_num_t i = num - 1;
-	    result = ptr[i];
 	    while (i-- > 0) {
-		const VALUE v = ptr[i];
-		if (result == Qundef || OPTIMIZED_CMP(v, result, cmp_opt) > 0) {
+		const VALUE v = *++ptr;
+		if (OPTIMIZED_CMP(v, result, cmp_opt) > 0) {
 		    result = v;
 		}
 	    }
-	    return result == Qundef ? Qnil : result;
+	    return result;
 	}
     }
     else {
@@ -3233,16 +3232,15 @@ vm_opt_newarray_min(rb_num_t num, const VALUE *ptr)
 	}
 	else {
 	    struct cmp_opt_data cmp_opt = { 0, 0 };
-	    VALUE result = Qundef;
+	    VALUE result = *ptr;
 	    rb_num_t i = num - 1;
-	    result = ptr[i];
 	    while (i-- > 0) {
-		const VALUE v = ptr[i];
-		if (result == Qundef || OPTIMIZED_CMP(v, result, cmp_opt) < 0) {
+		const VALUE v = *++ptr;
+		if (OPTIMIZED_CMP(v, result, cmp_opt) < 0) {
 		    result = v;
 		}
 	    }
-	    return result == Qundef ? Qnil : result;
+	    return result;
 	}
     }
     else {