From 81d5b699812dab4048543da77a40372bd4b4045c Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 16 Aug 2016 12:14:41 +0000 Subject: [PATCH] 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 --- ChangeLog | 13 +++++++++++++ compile.c | 1 + parse.y | 2 +- test/coverage/test_coverage.rb | 11 ++++++++++- version.h | 2 +- 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f16c39e2a..d6715b4275 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Tue Aug 16 21:12:07 2016 Nobuyoshi Nakada + + * 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 21:12:07 2016 SHIBATA Hiroshi + + * test/coverage/test_coverage.rb: ignored test when enabled to coverage. + It lead to crash with `make test-all`. + Tue Aug 16 21:01:55 2016 NARUSE, Yui * lib/uri/mailto.rb (initialize): RFC3986_Parser#split sets opaque diff --git a/compile.c b/compile.c index cc8e748c83..36db683c4a 100644 --- a/compile.c +++ b/compile.c @@ -245,6 +245,7 @@ r_value(VALUE value) #define ADD_TRACE(seq, line, event) \ do { \ if ((event) == RUBY_EVENT_LINE && iseq->coverage && \ + (line) > 0 && \ (line) != iseq->compile_data->last_coverable_line) { \ RARRAY_ASET(iseq->coverage, (line) - 1, INT2FIX(0)); \ iseq->compile_data->last_coverable_line = (line); \ diff --git a/parse.y b/parse.y index 68ef4e9cee..fcf9b52814 100644 --- a/parse.y +++ b/parse.y @@ -5454,7 +5454,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 f4f192a578..3c767c0e58 100644 --- a/test/coverage/test_coverage.rb +++ b/test/coverage/test_coverage.rb @@ -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, "", 0) + end + assert_include Coverage.result, "" + end +end unless ENV['COVERAGE'] diff --git a/version.h b/version.h index 24b0b0e674..5c30bcb98d 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.6" #define RUBY_RELEASE_DATE "2016-08-16" -#define RUBY_PATCHLEVEL 368 +#define RUBY_PATCHLEVEL 369 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 8