1 files changed, 62 insertions, 5 deletions
diff --git a/test/-ext-/debug/test_debug.rb b/test/-ext-/debug/test_debug.rb
index 8a351d74fa..c9263d76fa 100644
--- a/test/-ext-/debug/test_debug.rb
+++ b/test/-ext-/debug/test_debug.rb
@@ -26,11 +26,14 @@ class TestDebug < Test::Unit::TestCase
         count[:iseq] += 1
         assert_instance_of(RubyVM::InstructionSequence, iseq, msg)
 
-        # check same location
-        assert_equal(loc.path, iseq.path, msg)
-        assert_equal(loc.absolute_path, iseq.absolute_path, msg)
-        assert_equal(loc.label, iseq.label, msg)
-        assert_operator(loc.lineno, :>=, iseq.first_lineno, msg)
+        # Backtraces and source locations don't match for :c_trace methods
+        unless iseq.disasm.include?('C_TRACE')
+          # check same location
+          assert_equal(loc.path, iseq.path, msg)
+          assert_equal(loc.absolute_path, iseq.absolute_path, msg)
+          #assert_equal(loc.label, iseq.label, msg)
+          assert_operator(loc.lineno, :>=, iseq.first_lineno, msg)
+        end
       end
 
       assert_instance_of(Thread::Backtrace::Location, loc, msg)
@@ -73,3 +76,57 @@ class TestDebug < Test::Unit::TestCase
     assert_equal true, x, '[Bug #15105]'
   end
 end
+
+# This is a YJIT test, but we can't test this without a C extension that calls
+# rb_debug_inspector_open(), so we're testing it using "-test-/debug" here.
+class TestDebugWithYJIT < Test::Unit::TestCase
+  class LocalSetArray
+    def to_a
+      Bug::Debug.inspector.each do |_, binding,|
+        binding.local_variable_set(:local, :ok) if binding
+      end
+      [:ok]
+    end
+  end
+
+  class DebugArray
+    def to_a
+      Bug::Debug.inspector
+      [:ok]
+    end
+  end
+
+  def test_yjit_invalidates_getlocal_after_splatarray
+    val = getlocal_after_splatarray(LocalSetArray.new)
+    assert_equal [:ok, :ok], val
+  end
+
+  def test_yjit_invalidates_setlocal_after_splatarray
+    val = setlocal_after_splatarray(DebugArray.new)
+    assert_equal [:ok], val
+  end
+
+  def test_yjit_invalidates_setlocal_after_proc_call
+    val = setlocal_after_proc_call(proc { Bug::Debug.inspector; :ok })
+    assert_equal :ok, val
+  end
+
+  private
+
+  def getlocal_after_splatarray(array)
+    local = 1
+    [*array, local]
+  end
+
+  def setlocal_after_splatarray(array)
+    local = *array # setlocal followed by splatarray
+    itself # split a block using a C call
+    local # getlocal
+  end
+
+  def setlocal_after_proc_call(block)
+    local = block.call # setlocal followed by OPTIMIZED_METHOD_TYPE_CALL
+    itself # split a block using a C call
+    local # getlocal
+  end
+end if defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?