[ruby-cvs:63108] usa:r55943 (ruby_2_2): merge revision(s) 53424, 55509: [Backport #12517]

[usa at ruby-lang.org]

usa	2016-08-16 21:14:41 +0900 (Tue, 16 Aug 2016)

  New Revision: 55943

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55943

  Log:
    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]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/compile.c
    branches/ruby_2_2/parse.y
    branches/ruby_2_2/test/coverage/test_coverage.rb
    branches/ruby_2_2/version.h