From c03053cea5678cb96bb7ad9e21e3676ca4cfda56 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 8 Aug 2009 10:56:25 +0000 Subject: merges r24323 from trunk into ruby_1_9_1. -- * compile.c (iseq_compile_each): fix stack consistency error. [ruby-core:24611] * bootstraptest/test_method.rb: add tests for above. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24451 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ bootstraptest/test_method.rb | 10 ++++++++++ compile.c | 8 ++------ version.h | 2 +- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72c60ca89..1a73ec590 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Jul 30 21:39:42 2009 Yusuke Endoh + + * compile.c (iseq_compile_each): fix stack consistency error. + [ruby-core:24611] + + * bootstraptest/test_method.rb: add tests for above. + Thu Jul 30 16:45:39 2009 Nobuyoshi Nakada * insns.def (defineclass): preserve encoding of class/module diff --git a/bootstraptest/test_method.rb b/bootstraptest/test_method.rb index 8953a0d4d..2ce66f6a6 100644 --- a/bootstraptest/test_method.rb +++ b/bootstraptest/test_method.rb @@ -1151,3 +1151,13 @@ assert_normal_exit %q{ e.message == "undefined method `lalala!' for \"a\":String" ? :ok : :ng end }, '[ruby-core:22298]' + +assert_equal 'ok', %q{ + "hello"[0] ||= "H" + "ok" +} + +assert_equal 'ok', %q{ + "hello"[0, 1] ||= "H" + "ok" +} diff --git a/compile.c b/compile.c index 49dae66ab..de710d88d 100644 --- a/compile.c +++ b/compile.c @@ -3804,12 +3804,8 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) } ADD_INSNL(ret, nd_line(node), jump, lfin); ADD_LABEL(ret, label); - if (id == 0 || id == 1) { /* 0: or, 1: and */ - ADD_INSN(ret, nd_line(node), swap); - ADD_INSN(ret, nd_line(node), pop); - ADD_INSN(ret, nd_line(node), swap); - ADD_INSN(ret, nd_line(node), pop); - } + ADD_INSN1(ret, nd_line(node), setn, INT2FIX(FIX2INT(argc) + 1)); + ADD_INSN1(ret, nd_line(node), adjuststack, INT2FIX(FIX2INT(argc) + 1)); ADD_LABEL(ret, lfin); } else { diff --git a/version.h b/version.h index 73d45fad8..f32d823c7 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 256 +#define RUBY_PATCHLEVEL 257 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit