3 files changed, 6 insertions, 7 deletions
diff --git a/yjit.c b/yjit.c
index 2d3b7c9e9d..72d01d78f4 100644
--- a/yjit.c
+++ b/yjit.c
@@ -186,8 +186,9 @@ rb_yjit_exit_locations_dict(VALUE *yjit_raw_samples, int *yjit_line_samples, int
         int line_num = (int)yjit_line_samples[idx];
         idx++;
 
-        rb_ary_push(raw_samples, SIZET2NUM(num));
-        rb_ary_push(line_samples, INT2NUM(line_num));
+        // + 1 as we append an additional sample for the insn
+        rb_ary_push(raw_samples, SIZET2NUM(num + 1));
+        rb_ary_push(line_samples, INT2NUM(line_num + 1));
 
         // Loop through the length of samples_len and add data to the
         // frames hash. Also push the current value onto the raw_samples
diff --git a/yjit.rb b/yjit.rb
index 60a263c322..b2af7ef0be 100644
--- a/yjit.rb
+++ b/yjit.rb
@@ -67,7 +67,7 @@ module RubyVM::YJIT
     # [ length, line_1, line_2, line_n, ..., dummy value, count
     i = 0
     while i < raw_samples.length
-      stack_length = raw_samples[i] + 1
+      stack_length = raw_samples[i]
       i += 1 # consume the stack length
 
       sample_count = raw_samples[i + stack_length]
diff --git a/yjit/src/stats.rs b/yjit/src/stats.rs
index cc7f71b9bc..bf90b233f7 100644
--- a/yjit/src/stats.rs
+++ b/yjit/src/stats.rs
@@ -724,10 +724,8 @@ pub extern "C" fn rb_yjit_record_exit_stack(exit_pc: *const VALUE)
         // Push the insn value into the yjit_raw_samples Vec.
         yjit_raw_samples.push(VALUE(insn as usize));
 
-        // Push the current line onto the yjit_line_samples Vec. This
-        // points to the line in insns.def.
-        let line = yjit_line_samples.len() - 1;
-        yjit_line_samples.push(line as i32);
+        // We don't know the line
+        yjit_line_samples.push(0);
 
         // Push number of times seen onto the stack, which is 1
         // because it's the first time we've seen it.