yugui	2009-02-22 21:49:28 +0900 (Sun, 22 Feb 2009)

  New Revision: 22534

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22534

  Log:
    merges r22275 from trunk into ruby_1_9_1.
    * 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.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/proc.c
    branches/ruby_1_9_1/vm_core.h
    branches/ruby_1_9_1/vm_eval.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 22533)
+++ ruby_1_9_1/ChangeLog	(revision 22534)
@@ -1,3 +1,12 @@
+Fri Feb 13 15:11:11 2009  Koichi Sasada  <ko1@a...>
+
+	* 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@r...>
 
 	* compile.c (hide_obj): OBJ_FREEZE() is not an expression.  a patch
Index: ruby_1_9_1/vm_core.h
===================================================================
--- ruby_1_9_1/vm_core.h	(revision 22533)
+++ ruby_1_9_1/vm_core.h	(revision 22534)
@@ -590,6 +590,7 @@
 
 void *rb_thread_call_with_gvl(void *(*func)(void *), void *data1);
 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 *));
 
Index: ruby_1_9_1/vm_eval.c
===================================================================
--- ruby_1_9_1/vm_eval.c	(revision 22533)
+++ ruby_1_9_1/vm_eval.c	(revision 22534)
@@ -704,7 +704,7 @@
 	    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);
Index: ruby_1_9_1/proc.c
===================================================================
--- ruby_1_9_1/proc.c	(revision 22533)
+++ ruby_1_9_1/proc.c	(revision 22534)
@@ -271,8 +271,6 @@
     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)
 {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/