diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-13 06:25:59 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-13 06:25:59 +0000 |
commit | 0cb68b619ef80f8edb050ac4aa21306815b2a501 (patch) | |
tree | 2ed06dab1c9b981ac617b6bff3932f4107137891 | |
parent | c5d7d78daeb44b4c5ad7a9b624638ffd1be96135 (diff) | |
download | ruby-0cb68b619ef80f8edb050ac4aa21306815b2a501.tar.gz |
* vm_eval.c (eval_string_with_cref): use rb_vm_get_ruby_level_next_cfp()
instead of vm_get_ruby_level_caller_cfp(). checking a upper frame
is not enough. [ruby-dev:37984]
* proc.c, vm_core.h: declare rb_vm_get_ruby_level_next_cfp()
on vm_core.h.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22275 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | proc.c | 2 | ||||
-rw-r--r-- | vm_core.h | 1 | ||||
-rw-r--r-- | vm_eval.c | 2 |
4 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,12 @@ +Fri Feb 13 15:11:11 2009 Koichi Sasada <ko1@atdot.net> + + * vm_eval.c (eval_string_with_cref): use rb_vm_get_ruby_level_next_cfp() + instead of vm_get_ruby_level_caller_cfp(). checking a upper frame + is not enough. [ruby-dev:37984] + + * proc.c, vm_core.h: declare rb_vm_get_ruby_level_next_cfp() + on vm_core.h. + Fri Feb 13 15:01:40 2009 Koichi Sasada <ko1@atdot.net> * cont.c (rb_fiber_alive_p): fix to return true instead of 1. @@ -274,8 +274,6 @@ binding_clone(VALUE self) return bindval; } -rb_control_frame_t *rb_vm_get_ruby_level_next_cfp(rb_thread_t *th, rb_control_frame_t *cfp); - VALUE rb_binding_new(void) { @@ -593,6 +593,7 @@ int ruby_thread_has_gvl_p(void); VALUE rb_make_backtrace(void); typedef int rb_backtrace_iter_func(void *, const char *, int, const char *); VALUE rb_backtrace_each(rb_backtrace_iter_func *iter, void *arg); +rb_control_frame_t *rb_vm_get_ruby_level_next_cfp(rb_thread_t *th, rb_control_frame_t *cfp); NOINLINE(void rb_gc_save_machine_context(rb_thread_t *)); @@ -706,7 +706,7 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char th->base_block = &env->block; } else { - rb_control_frame_t *cfp = vm_get_ruby_level_caller_cfp(th, th->cfp); + rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(th, th->cfp); if (cfp != 0) { block = *RUBY_VM_GET_BLOCK_PTR_IN_CFP(cfp); |