summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-09 08:32:37 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-09 08:32:37 +0000
commit0303a45d0399f089c4920b0bc10ac87482f839ec (patch)
tree21389fe2e8da83c20d7c5a3e2f27cfabed1958fc
parent863396a5fef9d6ed213419279fa5165a68636724 (diff)
* compile.c (iseq_compile_each): Dynamic string literals should be
frozen. [ruby-core:57574] [Feature #8976] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--compile.c5
-rw-r--r--test/ruby/test_iseq.rb2
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 91fffb2..901d0db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Nov 9 17:29:09 2015 Shugo Maeda <shugo@ruby-lang.org>
+
+ * compile.c (iseq_compile_each): Dynamic string literals should be
+ frozen.
+ [ruby-core:57574] [Feature #8976]
+
Mon Nov 9 15:56:07 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* common.mk: Use ruby organization url for simplecov repository.
diff --git a/compile.c b/compile.c
index ba5f5be..5ad7625 100644
--- a/compile.c
+++ b/compile.c
@@ -5130,6 +5130,11 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
if (poped) {
ADD_INSN(ret, line, pop);
}
+ else {
+ if (iseq->compile_data->option->frozen_string_literal) {
+ ADD_SEND (ret, line, idFreeze, INT2FIX(0));
+ }
+ }
break;
}
case NODE_XSTR:{
diff --git a/test/ruby/test_iseq.rb b/test/ruby/test_iseq.rb
index b8d3c66..b239e0b 100644
--- a/test/ruby/test_iseq.rb
+++ b/test/ruby/test_iseq.rb
@@ -175,7 +175,7 @@ class TestISeq < Test::Unit::TestCase
s1, s2, s3, s4 = compile(code, line, {frozen_string_literal: true}).eval
assert_predicate(s1, :frozen?)
assert_predicate(s2, :frozen?)
- assert_not_predicate(s3, :frozen?)
+ assert_predicate(s3, :frozen?)
assert_predicate(s4, :frozen?)
assert_same(s1, s2)
end