https://git.ruby-lang.org/ruby.git/commit/?id=e4d85d3a2d

From e4d85d3a2d0c7d4a1abf981fb1ba557e21cad968 Mon Sep 17 00:00:00 2001
From: Jeremy Evans <code@j...>
Date: Mon, 4 Oct 2021 10:51:29 -0700
Subject: Revert rescue around internal realpath call on Solaris

Solaris CI still has a problem even with these commits, so it doesn't
appear to fix the issue.  Reverting both 84e8e2a39bba874433b661bd378165bd03c9d6aa
and bfd2f159f0c60ef8ac5bce6042edd25a571769b7.
---
 load.c                    | 29 +----------------------------
 test/ruby/test_process.rb |  3 +++
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/load.c b/load.c
index f0f7ac6cef..3c0c723f72 100644
--- a/load.c
+++ b/load.c
@@ -1060,33 +1060,6 @@ rb_ext_ractor_safe(bool flag) https://github.com/ruby/ruby/blob/trunk/load.c#L1060
     GET_THREAD()->ext_config.ractor_safe = flag;
 }
 
-#ifdef __sun
-static VALUE
-required_feature__realpath(VALUE path)
-{
-    return rb_realpath_internal(Qnil, path, 1);
-}
-
-static VALUE
-required_feature_realpath_rescue(VALUE path, VALUE exc)
-{
-    return path;
-}
-
-static VALUE
-required_feature_realpath(VALUE path)
-{
-    return rb_rescue(required_feature__realpath, path,
-        required_feature_realpath_rescue, path);
-}
-#else
-static VALUE
-required_feature_realpath(VALUE path)
-{
-    return rb_realpath_internal(Qnil, path, 1);
-}
-#endif
-
 /*
  * returns
  *  0: if already loaded (false)
@@ -1138,7 +1111,7 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa https://github.com/ruby/ruby/blob/trunk/load.c#L1111
 		result = TAG_RETURN;
 	    }
             else if (RTEST(rb_hash_aref(realpaths,
-                                        realpath = required_feature_realpath(path)))) {
+                                        realpath = rb_realpath_internal(Qnil, path, 1)))) {
                 result = 0;
             }
 	    else {
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index 07aa58418b..98c934945c 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -1732,6 +1732,9 @@ class TestProcess < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_process.rb#L1732
   end
 
   def test_no_curdir
+    if /solaris/i =~ RUBY_PLATFORM
+      skip "Temporary skip to avoid CI failures after commit to use realpath on required files"
+    end
     with_tmpchdir {|d|
       Dir.mkdir("vd")
       status = nil
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/