diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | bootstraptest/test_literal.rb | 5 | ||||
| -rw-r--r-- | compile.c | 5 |
3 files changed, 21 insertions, 0 deletions
@@ -1,3 +1,14 @@ +Thu Jan 10 03:29:55 2013 Koichi Sasada <ko1@atdot.net> + + * compile.c (compile_array_): modify wrong optimization. + A script "[print(1)]; print(2)" should output "12". + However, the compiler had eliminted "[print(1)]" expression + because it is void expression (unused array). + Of course, side-effect should be remained. + This issue is reported by Masaya Tarui. + + * bootstraptest/test_literal.rb: add a test. + Wed Jan 9 22:07:42 2013 Masaki Matsushita <glass.saga@gmail.com> * load.c (load_lock): if thread shield is destroyed and there is no diff --git a/bootstraptest/test_literal.rb b/bootstraptest/test_literal.rb index 5a9497c642..b95a2f2d0a 100644 --- a/bootstraptest/test_literal.rb +++ b/bootstraptest/test_literal.rb @@ -224,3 +224,8 @@ assert_equal 'ok', %q{ # long hash literal (optimized) eval "a = {#{(1..10_000).map{|n| "#{n} => #{n}"}.join(', ')}}" :ok } + +assert_equal 'ok', %q{ + [print(:ok), exit] # void literal with side-effect + :dummy +} @@ -2435,6 +2435,7 @@ compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root, else { ADD_INSN(anchor, line, concatarray); } + APPEND_LIST(ret, anchor); break; case COMPILE_ARRAY_TYPE_HASH: @@ -2461,6 +2462,10 @@ compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root, break; } } + else { + /* poped */ + APPEND_LIST(ret, anchor); + } } } } |