diff options
author | Yusuke Endoh <mame@ruby-lang.org> | 2020-03-16 23:03:22 +0900 |
---|---|---|
committer | Yusuke Endoh <mame@ruby-lang.org> | 2020-03-16 23:17:12 +0900 |
commit | 47141797bed55eb10932c9a722a5132f50d4f3d8 (patch) | |
tree | a2934da7ecc862d7746eaf0f504aea16cc35b653 /hash.c | |
parent | 4be2a891cce920d2e2c2ece572c66e5aabe98eaa (diff) | |
download | ruby-47141797bed55eb10932c9a722a5132f50d4f3d8.tar.gz |
hash.c: Do not use the fast path (rb_yield_values) for lambda blocks
As a semantics, Hash#each yields a 2-element array (pairs of keys and
values). So, `{ a: 1 }.each(&->(k, v) { })` should raise an exception
due to lambda's arity check.
However, the optimization that avoids Array allocation by using
rb_yield_values for blocks whose arity is more than 1 (introduced at
b9d29603375d17c3d1d609d9662f50beaec61fa1 and some commits), seemed to
overlook the lambda case, and wrongly allowed the code above to work.
This change experimentally attempts to make it strict; now the code
above raises an ArgumentError. This is an incompatible change; if the
compatibility issue is bigger than our expectation, it may be reverted
(until Ruby 3.0 release).
[Bug #12706]
Diffstat (limited to 'hash.c')
-rw-r--r-- | hash.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -3105,7 +3105,7 @@ static VALUE rb_hash_each_pair(VALUE hash) { RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size); - if (rb_block_arity() > 1) + if (rb_block_pair_yield_optimizable()) rb_hash_foreach(hash, each_pair_i_fast, 0); else rb_hash_foreach(hash, each_pair_i, 0); @@ -4446,7 +4446,7 @@ rb_hash_any_p(int argc, VALUE *argv, VALUE hash) /* yields pairs, never false */ return Qtrue; } - if (rb_block_arity() > 1) + if (rb_block_pair_yield_optimizable()) rb_hash_foreach(hash, any_p_i_fast, (VALUE)args); else rb_hash_foreach(hash, any_p_i, (VALUE)args); @@ -5500,7 +5500,7 @@ env_each_pair(VALUE ehash) } FREE_ENVIRON(environ); - if (rb_block_arity() > 1) { + if (rb_block_pair_yield_optimizable()) { for (i=0; i<RARRAY_LEN(ary); i+=2) { rb_yield_values(2, RARRAY_AREF(ary, i), RARRAY_AREF(ary, i+1)); } |