diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-03 08:51:29 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-03 08:51:29 +0000 |
commit | 4d1e32eac67cf5febd20461987259519089e1890 (patch) | |
tree | d43f2771addaa39b8f2e738f057bf779e6fb690d /vm_args.c | |
parent | 37c22bd945f30a095abbf41da2507d9f740040a4 (diff) | |
download | ruby-4d1e32eac67cf5febd20461987259519089e1890.tar.gz |
Revert "Symbol refinements"
Due to assertion failures when VM_CHECK_MODE >= 2.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66155 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,17 +851,13 @@ 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(symbol); - me = rb_resolve_refined_method_callable(refinements, (const rb_callable_method_entry_t *)rb_method_entry(CLASS_OF(obj), mid)); - + mid = SYM2ID(callback_arg); + me = rb_callable_method_entry_with_refinements(CLASS_OF(obj), mid, NULL); ec = GET_EC(); if (!NIL_P(blockarg)) { vm_passed_block_handler_set(ec, blockarg); @@ -889,8 +885,12 @@ 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 callback_arg = rb_ary_new_from_args(2, block_code, ref); - VALUE func = rb_func_proc_new(refine_sym_proc_call, callback_arg); + 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); + } block_code = func; } return block_code; |