From e0a264a9ef5f15e41f8109117d3372e69ae73181 Mon Sep 17 00:00:00 2001 From: mame Date: Fri, 30 May 2008 13:15:03 +0000 Subject: * compile.c (defined_expr): fix SEGV by defined?([1]). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16704 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ compile.c | 12 ++---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2f46a05b2..bc8c82b02d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri May 30 22:14:37 2008 Yusuke Endoh + + * compile.c (defined_expr): fix SEGV by defined?([1]). + Fri May 30 12:18:43 2008 Nobuyoshi Nakada * common.mk (prelude.c): simply depends on PREP. [ruby-dev:34877] diff --git a/compile.c b/compile.c index a91b48ce2f..f92f58cb64 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: -- cgit v1.2.3