From 96c50e47c56fede4ef4d33c31fb30baf4df6a2e2 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 5 Sep 2009 01:38:47 +0000 Subject: * compile.c (iseq_compile_each): &&= and ||= should return rhs. [ruby-dev:39163] (#1996), [ruby-core:25143] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24757 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++ compile.c | 32 +++++++++++++-------- test/ruby/test_basicinstructions.rb | 55 +++++++++++++++++++++++++------------ 3 files changed, 64 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 77462f5d92..3db8eba511 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Sep 5 10:38:46 2009 Nobuyoshi Nakada + + * compile.c (iseq_compile_each): &&= and ||= should return rhs. + [ruby-dev:39163] (#1996), [ruby-core:25143] + Sat Sep 5 08:51:43 2009 Nobuyoshi Nakada * re.c (update_char_offset): position should be long. diff --git a/compile.c b/compile.c index c9bc1ce8f6..510833fa25 100644 --- a/compile.c +++ b/compile.c @@ -3842,22 +3842,26 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) if lcfin # r o pop # r eval v # r v - send a= # v - jump lfin # v + swap # v r + topn 1 # v r v + send a= # v ? + jump lfin # v ? lcfin: # r o swap # o r - pop # o - lfin: # v + lfin: # o ? + pop # o # and dup # r o o unless lcfin pop # r eval v # r v - send a= # v - jump lfin # v + swap # v r + topn 1 # v r v + send a= # v ? + jump lfin # v ? # others eval v # r o v @@ -3881,26 +3885,32 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) } ADD_INSN(ret, nd_line(node), pop); COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value); + ADD_INSN(ret, nd_line(node), swap); + ADD_INSN1(ret, nd_line(node), topn, INT2FIX(1)); ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_aid), INT2FIX(1)); ADD_INSNL(ret, nd_line(node), jump, lfin); ADD_LABEL(ret, lcfin); ADD_INSN(ret, nd_line(node), swap); - ADD_INSN(ret, nd_line(node), pop); ADD_LABEL(ret, lfin); + ADD_INSN(ret, nd_line(node), pop); + if (poped) { + /* we can apply more optimize */ + ADD_INSN(ret, nd_line(node), pop); + } } else { COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value); ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_mid), INT2FIX(1)); + if (!poped) { + ADD_INSN(ret, nd_line(node), swap); + ADD_INSN1(ret, nd_line(node), topn, INT2FIX(1)); + } ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_aid), INT2FIX(1)); - } - - if (poped) { - /* we can apply more optimize */ ADD_INSN(ret, nd_line(node), pop); } break; diff --git a/test/ruby/test_basicinstructions.rb b/test/ruby/test_basicinstructions.rb index b3145be8b5..8da193f116 100644 --- a/test/ruby/test_basicinstructions.rb +++ b/test/ruby/test_basicinstructions.rb @@ -499,52 +499,73 @@ class TestBasicInstructions < Test::Unit::TestCase end class OP - attr_accessor :x + attr_reader :x + def x=(x) + @x = x + :Bug1996 + end + Bug1996 = '[ruby-dev:39163], [ruby-core:25143]' end def test_opassign x = nil - x ||= 1 + assert_equal 1, x ||= 1 assert_equal 1, x - x &&= 2 + assert_equal 2, x &&= 2 assert_equal 2, x - x ||= 3 + assert_equal 2, x ||= 3 assert_equal 2, x - x &&= 4 + assert_equal 4, x &&= 4 + assert_equal 4, x + assert_equal 5, x += 1 + assert_equal 5, x + assert_equal 4, x -= 1 assert_equal 4, x y = OP.new y.x = nil - y.x ||= 1 + assert_equal 1, y.x ||= 1, OP::Bug1996 assert_equal 1, y.x - y.x &&= 2 + assert_equal 2, y.x &&= 2, OP::Bug1996 assert_equal 2, y.x - y.x ||= 3 + assert_equal 2, y.x ||= 3 assert_equal 2, y.x - y.x &&= 4 + assert_equal 4, y.x &&= 4, OP::Bug1996 + assert_equal 4, y.x + assert_equal 5, y.x += 1, OP::Bug1996 + assert_equal 5, y.x + assert_equal 4, y.x -= 1, OP::Bug1996 assert_equal 4, y.x z = OP.new z.x = y z.x.x = nil - z.x.x ||= 1 + assert_equal 1, z.x.x ||= 1, OP::Bug1996 assert_equal 1, z.x.x - z.x.x &&= 2 + assert_equal 2, z.x.x &&= 2, OP::Bug1996 assert_equal 2, z.x.x - z.x.x ||= 3 + assert_equal 2, z.x.x ||= 3 assert_equal 2, z.x.x - z.x.x &&= 4 + assert_equal 4, z.x.x &&= 4, OP::Bug1996 + assert_equal 4, z.x.x + assert_equal 5, z.x.x += 1, OP::Bug1996 + assert_equal 5, z.x.x + assert_equal 4, z.x.x -= 1, OP::Bug1996 assert_equal 4, z.x.x a = [] a[0] = nil - a[0] ||= 1 + assert_equal 1, a[0] ||= 1 assert_equal 1, a[0] - a[0] &&= 2 + assert_equal 2, a[0] &&= 2 assert_equal 2, a[0] - a[0] ||= 3 + assert_equal 2, a[0] ||= 3 assert_equal 2, a[0] - a[0] &&= 4 + assert_equal 4, a[0] &&= 4 + assert_equal 4, a[0] + assert_equal 5, a[0] += 1 + assert_equal 5, a[0] + assert_equal 4, a[0] -= 1 assert_equal 4, a[0] end -- cgit v1.2.3