merge revision(s) bb849ffdb18305f01457de4e9848c830eb83a2d7:

	Added explicitly begin-end block for Ruby 2.4.

	  strscan, ipaddr and some default gems still support Ruby 2.4.

	  After this, I extract this CoreAssertions to their repositories.

2 files changed, 8 insertions, 6 deletions

diff --git a/tool/lib/core_assertions.rb b/tool/lib/core_assertions.rb
index 6b67da8334..dea37b093e 100644
--- a/tool/lib/core_assertions.rb
+++ b/tool/lib/core_assertions.rb
@@ -744,11 +744,13 @@ eom
       ].find do |c|
         if Process.const_defined?(c)
           [c.to_sym, Process.const_get(c)].find do |clk|
-            Process.clock_gettime(clk)
-          rescue
-            # Constants may be defined but not implemented, e.g., mingw.
-          else
-            PERFORMANCE_CLOCK = clk
+            begin
+              Process.clock_gettime(clk)
+            rescue
+              # Constants may be defined but not implemented, e.g., mingw.
+            else
+              PERFORMANCE_CLOCK = clk
+            end
           end
         end
       end
diff --git a/version.h b/version.h
index 3af432833e..eb9dcbea05 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 5
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 221
+#define RUBY_PATCHLEVEL 222
 
 #include "ruby/version.h"
 #include "ruby/internal/abi.h"