merge revision(s) 0d6263b: [Backport #21220]

k0kubun · k0kubun · commit 1b6f9cd6ea57 · 2025-04-14T16:25:55.000+09:00
Fix coverage measurement for negative line numbers

	Fixes [Bug #21220]

	Co-Authored-By: Mike Bourgeous &lt;mike@mikebourgeous.com&gt;
	Co-Authored-By: Jean Boussier &lt;jean.boussier@gmail.com&gt;
diff --git a/compile.c b/compile.c
@@ -10643,7 +10643,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
         if (nd_fl_newline(node)) {
             int event = RUBY_EVENT_LINE;
             ISEQ_COMPILE_DATA(iseq)->last_line = line;
-            if (ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq)) {
+            if (line > 0 && ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq)) {
                 event |= RUBY_EVENT_COVERAGE_LINE;
             }
             ADD_TRACE(ret, event);
diff --git a/prism_compile.c b/prism_compile.c
@@ -8599,7 +8599,7 @@ pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret,
         int event = RUBY_EVENT_LINE;
 
         ISEQ_COMPILE_DATA(iseq)->last_line = lineno;
-        if (ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq)) {
+        if (lineno > 0 && ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq)) {
             event |= RUBY_EVENT_COVERAGE_LINE;
         }
         PUSH_TRACE(ret, event);
diff --git a/test/coverage/test_coverage.rb b/test/coverage/test_coverage.rb
@@ -192,6 +192,23 @@ def test_eval_coverage
     end;
   end
 
+  def test_eval_negative_lineno
+    assert_in_out_err(ARGV, <<-"end;", ["[1, 1, 1]"], [])
+      Coverage.start(eval: true, lines: true)
+
+      eval(<<-RUBY, TOPLEVEL_BINDING, "test.rb", -2)
+      p # -2 # Not subject to measurement
+      p # -1 # Not subject to measurement
+      p #  0 # Not subject to measurement
+      p #  1 # Subject to measurement
+      p #  2 # Subject to measurement
+      p #  3 # Subject to measurement
+      RUBY
+
+      p Coverage.result["test.rb"][:lines]
+    end;
+  end
+
   def test_coverage_supported
     assert Coverage.supported?(:lines)
     assert Coverage.supported?(:oneshot_lines)
diff --git a/thread.c b/thread.c
@@ -5667,6 +5667,7 @@ update_line_coverage(VALUE data, const rb_trace_arg_t *trace_arg)
         VALUE lines = RARRAY_AREF(coverage, COVERAGE_INDEX_LINES);
         if (lines) {
             long line = rb_sourceline() - 1;
+            VM_ASSERT(line >= 0);
             long count;
             VALUE num;
             void rb_iseq_clear_event_flags(const rb_iseq_t *iseq, size_t pos, rb_event_flag_t reset);
diff --git a/version.h b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 2
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 31
+#define RUBY_PATCHLEVEL 32
 
 #include "ruby/version.h"
 #include "ruby/internal/abi.h"

Original file line number	Diff line number	Diff line change
`@@ -10643,7 +10643,7 @@ iseq_compile_each0(rb_iseq_t iseq, LINK_ANCHOR const ret, const NODE *const no`
`10643`	`10643`	`if (nd_fl_newline(node)) {`
`10644`	`10644`	`int event = RUBY_EVENT_LINE;`
`10645`	`10645`	`ISEQ_COMPILE_DATA(iseq)->last_line = line;`
`10646`		`- if (ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq)) {`
	`10646`	`+ if (line > 0 && ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq)) {`
`10647`	`10647`	`event \|= RUBY_EVENT_COVERAGE_LINE;`
`10648`	`10648`	`}`
`10649`	`10649`	`ADD_TRACE(ret, event);`
Original file line number	Diff line number	Diff line change
`@@ -8599,7 +8599,7 @@ pm_compile_node(rb_iseq_t iseq, const pm_node_t node, LINK_ANCHOR *const ret,`
`8599`	`8599`	`int event = RUBY_EVENT_LINE;`
`8600`	`8600`
`8601`	`8601`	`ISEQ_COMPILE_DATA(iseq)->last_line = lineno;`
`8602`		`- if (ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq)) {`
	`8602`	`+ if (lineno > 0 && ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq)) {`
`8603`	`8603`	`event \|= RUBY_EVENT_COVERAGE_LINE;`
`8604`	`8604`	`}`
`8605`	`8605`	`PUSH_TRACE(ret, event);`