diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-23 06:56:08 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-23 06:56:08 +0000 |
commit | e6ad53beaa8f61c784d7e6c9cace5bd6ecc4d5c8 (patch) | |
tree | 224599c7b347566e9d0050cb986052810b7df7cb /proc.c | |
parent | b32b2a61060a93babfa2f97cbc0a32be81b57dc0 (diff) |
remove VM_ENV_DATA_INDEX_ENV_PROC.
* vm_core.h (VM_ENV_DATA_INDEX_ENV_PROC): ep[VM_ENV_DATA_INDEX_ENV_PROC] is
allocated to mark a Proc which is created from iseq block.
However, `lep[0]` keeps Proc object itself as a block handler (Proc).
So we don't need to keep it.
* vm_core.h (VM_ENV_PROCVAL): ditto.
* vm.c (vm_make_env_each): do not need to keep blockprocval as special value.
* vm.c (vm_block_handler_escape): simply return Proc value.
* proc.c (proc_new): we don't need to check Env because a Proc type block
handler is a Proc object itself.
[Bug #14782]
* test/ruby/test_proc.rb: add a test for [Bug #14782]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63494 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'proc.c')
-rw-r--r-- | proc.c | 10 |
1 files changed, 1 insertions, 9 deletions
@@ -706,13 +706,6 @@ proc_new(VALUE klass, int8_t is_lambda) cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); if ((block_handler = rb_vm_frame_block_handler(cfp)) != VM_BLOCK_HANDLER_NONE) { - const VALUE *lep = rb_vm_ep_local_ep(cfp->ep); - - if (VM_ENV_ESCAPED_P(lep)) { - procval = VM_ENV_PROCVAL(lep); - goto return_existing_proc; - } - if (is_lambda) { rb_warn(proc_without_block); } @@ -730,13 +723,12 @@ proc_new(VALUE klass, int8_t is_lambda) case block_handler_type_proc: procval = VM_BH_TO_PROC(block_handler); - return_existing_proc: if (RBASIC_CLASS(procval) == klass) { return procval; } else { VALUE newprocval = rb_proc_dup(procval); - RBASIC_SET_CLASS(newprocval, klass); + RBASIC_SET_CLASS(newprocval, klass); return newprocval; } break; |