diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | compile.c | 5 | ||||
| -rw-r--r-- | test/ruby/test_iseq.rb | 2 |
3 files changed, 12 insertions, 1 deletions
@@ -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. @@ -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 b8d3c66715..b239e0b5c1 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 |