From 6f1dc851e038575f5aec2a85ce7815b04c63dca2 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 22 Dec 2017 11:43:00 +0000
Subject: [PATCH] merge revision(s) 57971: [Backport #13305]

	Fix a consistency bug of ISEQ_COVERAGE [Bug #13305]

	There is an invariant that ISEQ_COVERAGE(iseq) must be Qnil if and only
	if option->coverage_enabled is false.  This invariant was broken by
	NODE_PRELUDE which updates option->coverage_enabled but not
	ISEQ_COVERAGE(iseq).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@61414 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 compile.c                      |  5 ++++-
 test/coverage/test_coverage.rb | 30 ++++++++++++++++++++++++++++++
 version.h                      |  6 +++---
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/compile.c b/compile.c
index 44cb8025e8..c75e233251 100644
--- a/compile.c
+++ b/compile.c
@@ -6295,14 +6295,17 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
       }
       case NODE_PRELUDE:{
 	const rb_compile_option_t *orig_opt = ISEQ_COMPILE_DATA(iseq)->option;
+	VALUE orig_cov = ISEQ_COVERAGE(iseq);
+	rb_compile_option_t new_opt = *orig_opt;
 	if (node->nd_orig) {
-	    rb_compile_option_t new_opt = *orig_opt;
 	    rb_iseq_make_compile_option(&new_opt, node->nd_orig);
 	    ISEQ_COMPILE_DATA(iseq)->option = &new_opt;
 	}
+	if (!new_opt.coverage_enabled) ISEQ_COVERAGE_SET(iseq, Qfalse);
 	CHECK(COMPILE_POPPED(ret, "prelude", node->nd_head));
 	CHECK(COMPILE_(ret, "body", node->nd_body, popped));
 	ISEQ_COMPILE_DATA(iseq)->option = orig_opt;
+	ISEQ_COVERAGE_SET(iseq, orig_cov);
 	break;
       }
       case NODE_LAMBDA:{
diff --git a/test/coverage/test_coverage.rb b/test/coverage/test_coverage.rb
index 0753ccddc5..0fa8f9bd63 100644
--- a/test/coverage/test_coverage.rb
+++ b/test/coverage/test_coverage.rb
@@ -119,4 +119,34 @@ class TestCoverage < Test::Unit::TestCase
     end
     assert_include Coverage.result, "<compiled>"
   end
+
+  def test_eval
+    bug13305 = '[ruby-core:80079] [Bug #13305]'
+    loaded_features = $".dup
+
+    Dir.mktmpdir {|tmp|
+      Dir.chdir(tmp) {
+        File.open("test.rb", "w") do |f|
+          f.puts 'REPEATS = 400'
+          f.puts 'def add_method(target)'
+          f.puts '  REPEATS.times do'
+          f.puts '    target.class_eval(<<~RUBY, __FILE__, __LINE__ + 1)'
+          f.puts '      def foo'
+          f.puts '        #{"\n" * rand(REPEATS)}'
+          f.puts '      end'
+          f.puts '      1'
+          f.puts '    RUBY'
+          f.puts '  end'
+          f.puts 'end'
+        end
+
+        Coverage.start
+        require tmp + '/test.rb'
+        add_method(Class.new)
+        assert_equal Coverage.result[tmp + "/test.rb"], [1, 1, 1, 400, nil, nil, nil, nil, nil, nil, nil], bug13305
+      }
+    }
+  ensure
+    $".replace loaded_features
+  end
 end unless ENV['COVERAGE']
diff --git a/version.h b/version.h
index 337ab56512..2d6f307a5e 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.4.4"
-#define RUBY_RELEASE_DATE "2017-12-21"
-#define RUBY_PATCHLEVEL 219
+#define RUBY_RELEASE_DATE "2017-12-22"
+#define RUBY_PATCHLEVEL 220
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 21
+#define RUBY_RELEASE_DAY 22
 
 #include "ruby/version.h"