diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | compile.c | 1 | ||||
| -rw-r--r-- | parse.y | 2 | ||||
| -rw-r--r-- | test/coverage/test_coverage.rb | 11 | ||||
| -rw-r--r-- | version.h | 2 |
5 files changed, 26 insertions, 3 deletions
@@ -1,3 +1,16 @@ +Tue Aug 16 11:51:52 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] + +Tue Aug 16 11:51:52 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> + + * test/coverage/test_coverage.rb: ignored test when enabled to coverage. + It lead to crash with `make test-all`. + Tue Aug 16 11:46:07 2016 NARUSE, Yui <naruse@ruby-lang.org> * lib/uri/mailto.rb (initialize): RFC3986_Parser#split sets opaque @@ -252,6 +252,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); \ @@ -5495,7 +5495,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 4870b1006a..247b9d5254 100644 --- a/test/coverage/test_coverage.rb +++ b/test/coverage/test_coverage.rb @@ -111,4 +111,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'] @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.2" #define RUBY_RELEASE_DATE "2016-08-16" -#define RUBY_PATCHLEVEL 164 +#define RUBY_PATCHLEVEL 165 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 8 |