From 4f131605c30cf952240b97729cf74991801ce4c3 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 9 Dec 2018 06:46:44 +0000
Subject: [PATCH] conceptually partial backport from r63103, r65567. All
 ISeq#to_binary should rescue to skip when running with coverage. current
 trunk (2.6-) has assert_iseq_to_binary.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@66298 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_iseq.rb | 16 +++++++++++++++-
 version.h              |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/test/ruby/test_iseq.rb b/test/ruby/test_iseq.rb
index a8eb718f21cb00..ed88c9b43d0649 100644
--- a/test/ruby/test_iseq.rb
+++ b/test/ruby/test_iseq.rb
@@ -392,6 +392,9 @@ class C   # line 7 empty class
   end
 
   def test_to_binary_with_objects
+    # conceptually backport from r62856.
+    # ISeq binary dump doesn't consider alignment in 2.5 and older
+    skip "does not work on other than x86" unless /x(?:86|64)|i\d86/ =~ RUBY_PLATFORM
     code = "[]"+100.times.map{|i|"<</#{i}/"}.join
     iseq = RubyVM::InstructionSequence.compile(code)
     bin = assert_nothing_raised do
@@ -405,9 +408,20 @@ def test_to_binary_with_objects
   end
 
   def test_to_binary_tracepoint
+    # conceptually backport from r62856.
+    # ISeq binary dump doesn't consider alignment in 2.5 and older
+    skip "does not work on other than x86" unless /x(?:86|64)|i\d86/ =~ RUBY_PLATFORM
     filename = "#{File.basename(__FILE__)}_#{__LINE__}"
     iseq = RubyVM::InstructionSequence.compile("x = 1\n y = 2", filename)
-    iseq_bin = iseq.to_binary
+    # conceptually partial backport from r63103, r65567.
+    # All ISeq#to_binary should rescue to skip when running with coverage.
+    # current trunk (2.6-) has assert_iseq_to_binary.
+    begin
+      iseq_bin = iseq.to_binary
+    rescue RuntimeError => e
+      skip e.message if /compile with coverage/ =~ e.message
+      raise
+    end
     ary = []
     TracePoint.new(:line){|tp|
       next unless tp.path == filename
diff --git a/version.h b/version.h
index 4d8f44f02ff164..07a5e8738ce55a 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.5.4"
 #define RUBY_RELEASE_DATE "2018-12-09"
-#define RUBY_PATCHLEVEL 121
+#define RUBY_PATCHLEVEL 122
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 12