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

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16704 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index b2f46a05b..bc8c82b02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri May 30 22:14:37 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c (defined_expr): fix SEGV by defined?([1]).
+
 Fri May 30 12:18:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk (prelude.c): simply depends on PREP.  [ruby-dev:34877]
diff --git a/compile.c b/compile.c
index a91b48ce2..f92f58cb6 100644
--- a/compile.c
+++ b/compile.c
@@ -2327,18 +2327,10 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
 	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: