archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r22275 from trunk into ruby_1_9_1.

Browse source 
* 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/branches/ruby_1_9_1@22534 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-02-22 12:49:28 +00:00
parent c7782f91c8
commit 174eed3541
4 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -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.
Thu Feb 12 22:51:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Feb 12 22:51:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c (hide_obj): OBJ_FREEZE() is not an expression. a patch * compile.c (hide_obj): OBJ_FREEZE() is not an expression. a patch

2
proc.c
View file

@ -271,8 +271,6 @@ binding_clone(VALUE self)
return bindval; return bindval;
} }
rb_control_frame_t *rb_vm_get_ruby_level_next_cfp(rb_thread_t *th, rb_control_frame_t *cfp);
VALUE VALUE
rb_binding_new(void) rb_binding_new(void)
{ {

1
vm_core.h
View file

@ -590,6 +590,7 @@ VALUE rb_vm_make_env_object(rb_thread_t *th, rb_control_frame_t *cfp);
void *rb_thread_call_with_gvl(void *(*func)(void *), void *data1); void *rb_thread_call_with_gvl(void *(*func)(void *), void *data1);
int ruby_thread_has_gvl_p(void); int ruby_thread_has_gvl_p(void);
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 *)); NOINLINE(void rb_gc_save_machine_context(rb_thread_t *));

2
vm_eval.c
View file

@ -704,7 +704,7 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char
th->base_block = &env->block; th->base_block = &env->block;
} }
else { 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) { if (cfp != 0) {
block = *RUBY_VM_GET_BLOCK_PTR_IN_CFP(cfp); block = *RUBY_VM_GET_BLOCK_PTR_IN_CFP(cfp);