From a5e2f3221a96ee54dd8f5abdfc4439328f34e386 Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 9 Jan 2013 18:38:41 +0000
Subject: [PATCH] * 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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                     | 11 +++++++++++
 bootstraptest/test_literal.rb |  5 +++++
 compile.c                     |  5 +++++
 3 files changed, 21 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d10714b192..fcdd479ccb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
+}
diff --git a/compile.c b/compile.c
index 21bb780ddb..5e0b61572e 100644
--- a/compile.c
+++ b/compile.c
@@ -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);
+		}
 	    }
 	}
     }