diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | compile.c | 1 | ||||
| -rw-r--r-- | parse.y | 2 | ||||
| -rw-r--r-- | test/coverage/test_coverage.rb | 9 |
4 files changed, 19 insertions, 1 deletions
@@ -1,3 +1,11 @@ +Mon Jun 27 08:56:55 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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] + Sun Jun 26 10:20:25 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/win32/lib/Win32API.rb (Win32API#initialize): Cygwin @@ -253,6 +253,7 @@ r_value(VALUE value) #define ADD_TRACE(seq, line, event) \ do { \ if ((event) == RUBY_EVENT_LINE && ISEQ_COVERAGE(iseq) && \ + (line) > 0 && \ (line) != ISEQ_COMPILE_DATA(iseq)->last_coverable_line) { \ RARRAY_ASET(ISEQ_COVERAGE(iseq), (line) - 1, INT2FIX(0)); \ ISEQ_COMPILE_DATA(iseq)->last_coverable_line = (line); \ @@ -5493,7 +5493,7 @@ coverage(VALUE fname, int n) { VALUE coverages = rb_get_coverages(); if (RTEST(coverages) && RBASIC(coverages)->klass == 0) { - VALUE lines = rb_ary_tmp_new_fill(n); + VALUE lines = n > 0 ? rb_ary_tmp_new_fill(n) : rb_ary_tmp_new(0); rb_hash_aset(coverages, fname, lines); return lines; } diff --git a/test/coverage/test_coverage.rb b/test/coverage/test_coverage.rb index 8bc1104d75..0753ccddc5 100644 --- a/test/coverage/test_coverage.rb +++ b/test/coverage/test_coverage.rb @@ -110,4 +110,13 @@ class TestCoverage < Test::Unit::TestCase ensure $".replace loaded_features 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'] |