diff options
| -rw-r--r-- | compile.c | 23 | ||||
| -rw-r--r-- | test/ruby/test_literal.rb | 14 |
2 files changed, 37 insertions, 0 deletions
@@ -2302,6 +2302,21 @@ iseq_pop_newarray(rb_iseq_t *iseq, INSN *iobj) } static int +same_debug_pos_p(LINK_ELEMENT *iobj1, LINK_ELEMENT *iobj2) +{ + VALUE debug1 = OPERAND_AT(iobj1, 0); + VALUE debug2 = OPERAND_AT(iobj2, 0); + if (debug1 == debug2) return TRUE; + if (!RB_TYPE_P(debug1, T_ARRAY)) return FALSE; + if (!RB_TYPE_P(debug2, T_ARRAY)) return FALSE; + if (RARRAY_LEN(debug1) != 2) return FALSE; + if (RARRAY_LEN(debug2) != 2) return FALSE; + if (RARRAY_AREF(debug1, 0) != RARRAY_AREF(debug2, 0)) return FALSE; + if (RARRAY_AREF(debug1, 1) != RARRAY_AREF(debug2, 1)) return FALSE; + return TRUE; +} + +static int iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcallopt) { INSN *const iobj = (INSN *)list; @@ -2637,6 +2652,14 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal OPERAND_AT(jump, 0) = (VALUE)label; } label->refcnt++; + if (freeze && IS_NEXT_INSN_ID(next, freezestring)) { + if (same_debug_pos_p(freeze, next->next)) { + REMOVE_ELEM(freeze); + } + else { + next = next->next; + } + } INSERT_ELEM_NEXT(next, &label->link); CHECK(iseq_peephole_optimize(iseq, get_next_insn(jump), do_tailcallopt)); } diff --git a/test/ruby/test_literal.rb b/test/ruby/test_literal.rb index 9645e3234b..67a383bc3c 100644 --- a/test/ruby/test_literal.rb +++ b/test/ruby/test_literal.rb @@ -177,6 +177,20 @@ class TestRubyLiteral < Test::Unit::TestCase end end + if defined?(RubyVM::InstructionSequence.compile_option) and + RubyVM::InstructionSequence.compile_option.key?(:debug_frozen_string_literal) + def test_debug_frozen_string + src = 'n = 1; "foo#{n ? "-#{n}" : ""}"'; f = "test.rb"; n = 1 + opt = {frozen_string_literal: true, debug_frozen_string_literal: true} + str = RubyVM::InstructionSequence.compile(src, f, f, n, opt).eval + assert_equal("foo-1", str) + assert_predicate(str, :frozen?) + assert_raise_with_message(RuntimeError, /created at #{Regexp.quote(f)}:#{n}/) { + str << "x" + } + end + end + def test_regexp assert_instance_of Regexp, // assert_match(//, 'a') |