diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-22 11:43:00 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-22 11:43:00 +0000 |
| commit | 6f1dc851e038575f5aec2a85ce7815b04c63dca2 (patch) | |
| tree | 019d5ef9e4e0ecdd97e8ca46ab32cebe954d6d04 /compile.c | |
| parent | d2b5c16e1955b0f7887b15a505f5848669ae2935 (diff) | |
merge revision(s) 57971: [Backport #13305]
Fix a consistency bug of ISEQ_COVERAGE [Bug #13305]
There is an invariant that ISEQ_COVERAGE(iseq) must be Qnil if and only
if option->coverage_enabled is false. This invariant was broken by
NODE_PRELUDE which updates option->coverage_enabled but not
ISEQ_COVERAGE(iseq).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@61414 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'compile.c')
| -rw-r--r-- | compile.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -6295,14 +6295,17 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe } case NODE_PRELUDE:{ const rb_compile_option_t *orig_opt = ISEQ_COMPILE_DATA(iseq)->option; + VALUE orig_cov = ISEQ_COVERAGE(iseq); + rb_compile_option_t new_opt = *orig_opt; if (node->nd_orig) { - rb_compile_option_t new_opt = *orig_opt; rb_iseq_make_compile_option(&new_opt, node->nd_orig); ISEQ_COMPILE_DATA(iseq)->option = &new_opt; } + if (!new_opt.coverage_enabled) ISEQ_COVERAGE_SET(iseq, Qfalse); CHECK(COMPILE_POPPED(ret, "prelude", node->nd_head)); CHECK(COMPILE_(ret, "body", node->nd_body, popped)); ISEQ_COMPILE_DATA(iseq)->option = orig_opt; + ISEQ_COVERAGE_SET(iseq, orig_cov); break; } case NODE_LAMBDA:{ |