diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | compile.c | 12 |
2 files changed, 6 insertions, 10 deletions
@@ -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] @@ -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: |