diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-03 01:50:50 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-03 01:50:50 +0000 |
commit | 03cad835932205e9ca9e11bed1e6394272ca3f5c (patch) | |
tree | e99a0dbd528aa38d6b384eaa2518a9f0510e5838 /proc.c | |
parent | 0cd7f5fe87fb2d047a5423cd24c24f9fea530502 (diff) |
* vm_core.h: introduce VM_FRAME_RUBYFRAME_P()
and VM_FRAME_CFRAME_P().
Most of case, RUBY_VM_NORMAL_ISEQ_P() is no
longer needed.
* vm_core.h: introduce rb_obj_is_iseq().
* cont.c, vm.c: VM_FRAME_MAGIC_DUMMY with
VM_FRAME_FLAG_CFRAME.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'proc.c')
-rw-r--r-- | proc.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -395,12 +395,12 @@ static const VALUE * get_local_variable_ptr(const rb_env_t *env, ID lid) { do { - const rb_iseq_t *iseq; - unsigned int i; + if (!VM_ENV_FLAGS(env->ep, VM_FRAME_FLAG_CFRAME)) { + const rb_iseq_t *iseq = env->iseq; + unsigned int i; - iseq = env->iseq; + VM_ASSERT(rb_obj_is_iseq((VALUE)iseq)); - if (iseq && RUBY_VM_NORMAL_ISEQ_P(iseq)) { for (i=0; i<iseq->body->local_table_size; i++) { if (iseq->body->local_table[i] == lid) { return &env->env[i]; |