nobu	2008-05-07 17:41:16 +0900 (Wed, 07 May 2008)

  New Revision: 16310

  Modified files:
    trunk/ChangeLog
    trunk/vm.c

  Log:
    * vm.c (vm_eval_body): initialize retval.  [ruby-dev:34576]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16310&r2=16309&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/vm.c?r1=16310&r2=16309&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16309)
+++ ChangeLog	(revision 16310)
@@ -1,3 +1,7 @@
+Wed May  7 17:41:14 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* vm.c (vm_eval_body): initialize retval.  [ruby-dev:34576]
+
 Wed May  7 13:02:56 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* bignum.c (rb_big_fdiv): flo.fdiv(NaN) should result NaN.
Index: vm.c
===================================================================
--- vm.c	(revision 16309)
+++ vm.c	(revision 16310)
@@ -911,8 +911,9 @@
 {
     VALUE result = Qnil;
 
-    if (val == Qundef)
+    if (val == Qundef) {
 	val = GET_THREAD()->tag->retval;
+    }
     switch (state) {
       case 0:
 	break;
@@ -1140,8 +1141,10 @@
     int state;
     VALUE result, err;
     VALUE initial = 0;
+    VALUE *escape_dfp = NULL;
 
     TH_PUSH_TAG(th);
+    _tag.retval = Qnil;
     if ((state = EXEC_TAG()) == 0) {
       vm_loop_start:
 	result = vm_eval(th, initial);
@@ -1157,7 +1160,6 @@
 	unsigned long epc, cont_pc, cont_sp;
 	VALUE catch_iseqval;
 	rb_control_frame_t *cfp;
-	VALUE *escape_dfp = NULL;
 	VALUE type;
 
 	err = th->errinfo;

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