diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-05 10:59:57 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-05 10:59:57 +0000 |
| commit | 61cb2958095fe3b05fcec25aea943fa3e06262e6 (patch) | |
| tree | b5b285662c21626a6d6e92fbf609af1a80f8a704 /vm_insnhelper.c | |
| parent | fcb4a3d88fa38589239281b1b670b95fba47b277 (diff) | |
merge revision(s) 61766: [Backport #14350]
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/branches/ruby_2_5@64195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index d4f2c2a00c..0a2eb94753 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -3186,16 +3186,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 { @@ -3213,16 +3212,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 { |