mame	2008-05-30 22:15:03 +0900 (Fri, 30 May 2008)

  New Revision: 16704

  Modified files:
    trunk/ChangeLog
    trunk/compile.c

  Log:
    * compile.c (defined_expr): fix SEGV by defined?([1]).


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/compile.c?r1=16704&r2=16703&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16704&r2=16703&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16703)
+++ ChangeLog	(revision 16704)
@@ -1,3 +1,7 @@
+Fri May 30 22:14:37 2008  Yusuke Endoh  <mame@t...>
+
+	* compile.c (defined_expr): fix SEGV by defined?([1]).
+
 Fri May 30 12:18:43 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* common.mk (prelude.c): simply depends on PREP.  [ruby-dev:34877]
Index: compile.c
===================================================================
--- compile.c	(revision 16703)
+++ compile.c	(revision 16704)
@@ -2327,18 +2327,10 @@
 	do {
 	    defined_expr(iseq, ret, vals->nd_head, lfinish, Qfalse);
 
-	    if (lfinish[1]) {
-		ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
-	    }
-	    else {
-		LABEL *lcont = NEW_LABEL(nd_line(node));
+	    if (!lfinish[1]) {
 		lfinish[1] = NEW_LABEL(nd_line(node));
-		ADD_INSNL(ret, nd_line(node), branchif, lcont);
-		ADD_LABEL(ret, lfinish[1]);
-		ADD_INSN(ret, nd_line(node), putnil);
-		ADD_INSNL(ret, nd_line(node), jump, lfinish[0]);
-		ADD_LABEL(ret, lcont);
 	    }
+	    ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
 	} while ((vals = vals->nd_next) != NULL);
       }
       case NODE_STR:

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