1 files changed, 11 insertions, 4 deletions

diff --git a/vm_eval.c b/vm_eval.c
index 4dfff02f6b..8da3f3c529 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -1629,6 +1629,10 @@ pm_eval_make_iseq(VALUE src, VALUE fname, int line,
     const rb_iseq_t *const parent = vm_block_iseq(base_block);
     const rb_iseq_t *iseq = parent;
     VALUE name = rb_fstring_lit("<compiled>");
+
+    // Conditionally enable coverage depending on the current mode:
+    int coverage_enabled = ((rb_get_coverage_mode() & COVERAGE_TARGET_EVAL) != 0) ? 1 : 0;
+
     if (!fname) {
         fname = rb_source_location(&line);
     }
@@ -1638,10 +1642,12 @@ pm_eval_make_iseq(VALUE src, VALUE fname, int line,
     }
     else {
         fname = get_eval_default_path();
+        coverage_enabled = 0;
     }
 
     pm_parse_result_t result = { 0 };
     pm_options_line_set(&result.options, line);
+    result.node.coverage_enabled = coverage_enabled;
 
     // Cout scopes, one for each parent iseq, plus one for our local scope
     int scopes_count = 0;
@@ -1703,6 +1709,7 @@ pm_eval_make_iseq(VALUE src, VALUE fname, int line,
         RUBY_ASSERT(parent_scope != NULL);
 
         pm_options_scope_t *options_scope = &result.options.scopes[scopes_count - scopes_index - 1];
+        parent_scope->coverage_enabled = coverage_enabled;
         parent_scope->parser = &result.parser;
         parent_scope->index_lookup_table = st_init_numtable();
 
@@ -1753,7 +1760,7 @@ eval_make_iseq(VALUE src, VALUE fname, int line,
     const VALUE parser = rb_parser_new();
     const rb_iseq_t *const parent = vm_block_iseq(base_block);
     rb_iseq_t *iseq = NULL;
-    VALUE vast;
+    VALUE ast_value;
     rb_ast_t *ast;
     int isolated_depth = 0;
 
@@ -1791,13 +1798,13 @@ eval_make_iseq(VALUE src, VALUE fname, int line,
 
     rb_parser_set_context(parser, parent, FALSE);
     if (ruby_vm_keep_script_lines) rb_parser_set_script_lines(parser);
-    vast = rb_parser_compile_string_path(parser, fname, src, line);
+    ast_value = rb_parser_compile_string_path(parser, fname, src, line);
 
-    ast = rb_ruby_ast_data_get(vast);
+    ast = rb_ruby_ast_data_get(ast_value);
 
     if (ast->body.root) {
         ast->body.coverage_enabled = coverage_enabled;
-        iseq = rb_iseq_new_eval(vast,
+        iseq = rb_iseq_new_eval(ast_value,
                                 ISEQ_BODY(parent)->location.label,
                                 fname, Qnil, line,
                                 parent, isolated_depth);