From 050a10c607e471bb2f387eb9644db5ee9e43c46b Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 23 Nov 2007 01:46:44 +0000 Subject: * compile.c (defined_expr): defined(method(x)) dumped core. a patch from Yusuke ENDOH . [ruby-dev:32335] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13998 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- compile.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'compile.c') diff --git a/compile.c b/compile.c index 91c94276c7..ce462fef0d 100644 --- a/compile.c +++ b/compile.c @@ -2295,13 +2295,11 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret, if (node->nd_args) { lfalse = NEW_LABEL(nd_line(node)); defined_expr(iseq, ret, node->nd_args, lfinish, Qfalse); + ADD_INSNL(ret, nd_line(node), branchunless, lfalse); } if (!self) { LABEL *lcont = NEW_LABEL(nd_line(node)); - if (lfalse) { - ADD_INSNL(ret, nd_line(node), branchunless, lfalse); - } defined_expr(iseq, ret, node->nd_recv, lfinish, Qfalse); ADD_INSNL(ret, nd_line(node), branchif, lcont); if (lfalse) { @@ -2319,9 +2317,8 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret, ADD_INSN(ret, nd_line(node), putself); ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_FUNC), ID2SYM(node->nd_mid), needstr); + ADD_INSNL(ret, nd_line(node), jump, lfinish); if (lfalse) { - ADD_INSNL(ret, nd_line(node), branchif, lfinish); - ADD_LABEL(ret, lfalse); ADD_INSN(ret, nd_line(node), putnil); ADD_INSNL(ret, nd_line(node), jump, lfinish); -- cgit v1.2.3