diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-25 02:14:36 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-25 02:14:36 +0000 |
commit | b40dbc304efe8297d7dbe10d6781c7608a651934 (patch) | |
tree | b47aae37fe4eb80d8ecc564ec2563db807d4d910 /vm.c | |
parent | 29962f8fb6687010e005cbf311a791e4eafb2eae (diff) | |
download | ruby-b40dbc304efe8297d7dbe10d6781c7608a651934.tar.gz |
* vm.c: check frame is FINAL when creating env.
[ruby-core:14395]
* bootstraptest/test_block.rb: add a test for above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14641 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -238,7 +238,7 @@ vm_make_env_each(rb_thread_t *th, rb_control_frame_t *cfp, for (i = 0; i <= local_size; i++) { env->env[i] = envptr[-local_size + i]; #if 0 - dp(env->env[i]); + fprintf(stderr, "%2d ", &envptr[-local_size + i] - th->stack); dp(env->env[i]); if (RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) { /* clear value stack for GC */ envptr[-local_size + i] = 0; @@ -315,6 +315,11 @@ vm_make_env_object(rb_thread_t *th, rb_control_frame_t *cfp) { VALUE envval; + if (VM_FRAME_FLAG(cfp->flag) == FRAME_MAGIC_FINISH) { + /* for method_missing */ + cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); + } + envval = vm_make_env_each(th, cfp, cfp->dfp, cfp->lfp); if (PROCDEBUG) { |