diff options
| -rw-r--r-- | test/ruby/test_yjit.rb | 19 | ||||
| -rw-r--r-- | yjit/src/codegen.rs | 6 |
2 files changed, 23 insertions, 2 deletions
diff --git a/test/ruby/test_yjit.rb b/test/ruby/test_yjit.rb index 703313f4ab..925efdf39f 100644 --- a/test/ruby/test_yjit.rb +++ b/test/ruby/test_yjit.rb @@ -1216,6 +1216,25 @@ class TestYJIT < Test::Unit::TestCase RUBY end + def test_str_concat_encoding_mismatch + assert_compiles(<<~'RUBY', result: "incompatible character encodings: ASCII-8BIT and EUC-JP") + def bar(a, b) + a << b + rescue => e + e.message + end + + def foo(a, b, h) + h[nil] + bar(a, b) # Ruby call, not set cfp->pc + end + + h = Hash.new { nil } + foo("\x80".b, "\xA1A1".force_encoding("EUC-JP"), h) + foo("\x80".b, "\xA1A1".force_encoding("EUC-JP"), h) + RUBY + end + private def code_gc_helpers diff --git a/yjit/src/codegen.rs b/yjit/src/codegen.rs index 79267481fe..513cf9d308 100644 --- a/yjit/src/codegen.rs +++ b/yjit/src/codegen.rs @@ -4479,8 +4479,10 @@ fn jit_rb_str_concat( // Guard that the concat argument is a string guard_object_is_string(ctx, asm, ctx.stack_opnd(0), StackOpnd(0), side_exit); - // Guard buffers from GC since rb_str_buf_append may allocate. - gen_save_sp(asm, ctx); + // Guard buffers from GC since rb_str_buf_append may allocate. During the VM lock on GC, + // other Ractors may trigger global invalidation, so we need ctx.clear_local_types(). + // PC is used on errors like Encoding::CompatibilityError raised by rb_str_buf_append. + jit_prepare_routine_call(jit, ctx, asm); let concat_arg = ctx.stack_pop(1); let recv = ctx.stack_pop(1); |