diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-03 04:34:27 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-03 04:34:27 +0000 |
commit | cd5b309575488d808db3e692e5fe58295f32a30f (patch) | |
tree | 13615730f7952b4d867cc6f3bb57723580eb9bdc /vm_args.c | |
parent | 1e9896ae314d23ce813d86796ed3f29669c9db9b (diff) |
Symbol refinements [Bug #15114]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66149 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_args.c')
-rw-r--r-- | vm_args.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -851,13 +851,17 @@ refine_sym_proc_call(RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg)) ID mid; const rb_callable_method_entry_t *me; rb_execution_context_t *ec; + const VALUE symbol = RARRAY_AREF(callback_arg, 0); + const VALUE refinements = RARRAY_AREF(callback_arg, 1); if (argc-- < 1) { rb_raise(rb_eArgError, "no receiver given"); } obj = *argv++; - mid = SYM2ID(callback_arg); - me = rb_callable_method_entry_with_refinements(CLASS_OF(obj), mid, NULL); + + mid = SYM2ID(symbol); + me = rb_resolve_refined_method_callable(refinements, (const rb_callable_method_entry_t *)rb_method_entry(CLASS_OF(obj), mid)); + ec = GET_EC(); if (!NIL_P(blockarg)) { vm_passed_block_handler_set(ec, blockarg); @@ -885,12 +889,8 @@ vm_caller_setup_arg_block(const rb_execution_context_t *ec, rb_control_frame_t * const rb_cref_t *cref = vm_env_cref(reg_cfp->ep); if (cref && !NIL_P(cref->refinements)) { VALUE ref = cref->refinements; - VALUE func = rb_hash_lookup(ref, block_code); - if (NIL_P(func)) { - /* TODO: limit cached funcs */ - func = rb_func_proc_new(refine_sym_proc_call, block_code); - rb_hash_aset(ref, block_code, func); - } + VALUE callback_arg = rb_ary_new_from_args(2, block_code, ref); + VALUE func = rb_func_proc_new(refine_sym_proc_call, callback_arg); block_code = func; } return block_code; |