merge revision(s) 53424,55509: [Backport #12517]

* test/coverage/test_coverage.rb: ignored test when enabled to coverage.
	  It lead to crash with `make test-all`.

	* compile.c (ADD_TRACE): ignore trace instruction on non-positive
	  line.

	* parse.y (coverage): get rid of ArgumentError when the starting
	  line number is not positive.  [ruby-core:76141] [Bug #12517]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55943 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2016-08-16 12:14:41 +00:00
parent 4142e34eb1
commit 81d5b69981
5 changed files with 26 additions and 3 deletions

View file

@ -61,4 +61,13 @@ class TestCoverage < Test::Unit::TestCase
ensure
$".replace loaded_features
end
end
def test_nonpositive_linenumber
bug12517 = '[ruby-core:76141] [Bug #12517]'
Coverage.start
assert_nothing_raised(ArgumentError, bug12517) do
RubyVM::InstructionSequence.compile(":ok", nil, "<compiled>", 0)
end
assert_include Coverage.result, "<compiled>"
end
end unless ENV['COVERAGE']