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
This commit is contained in:
nagachika 2017-12-22 11:43:00 +00:00
parent d2b5c16e19
commit 6f1dc851e0
3 changed files with 37 additions and 4 deletions

View file

@ -119,4 +119,34 @@ class TestCoverage < Test::Unit::TestCase
end
assert_include Coverage.result, "<compiled>"
end
def test_eval
bug13305 = '[ruby-core:80079] [Bug #13305]'
loaded_features = $".dup
Dir.mktmpdir {|tmp|
Dir.chdir(tmp) {
File.open("test.rb", "w") do |f|
f.puts 'REPEATS = 400'
f.puts 'def add_method(target)'
f.puts ' REPEATS.times do'
f.puts ' target.class_eval(<<~RUBY, __FILE__, __LINE__ + 1)'
f.puts ' def foo'
f.puts ' #{"\n" * rand(REPEATS)}'
f.puts ' end'
f.puts ' 1'
f.puts ' RUBY'
f.puts ' end'
f.puts 'end'
end
Coverage.start
require tmp + '/test.rb'
add_method(Class.new)
assert_equal Coverage.result[tmp + "/test.rb"], [1, 1, 1, 400, nil, nil, nil, nil, nil, nil, nil], bug13305
}
}
ensure
$".replace loaded_features
end
end unless ENV['COVERAGE']