aboutsummaryrefslogtreecommitdiffstats
path: root/load.c
diff options
context:
space:
mode:
authorJeremy Evans <code@jeremyevans.net>2021-10-04 10:51:29 -0700
committerJeremy Evans <code@jeremyevans.net>2021-10-04 10:51:52 -0700
commite4d85d3a2d0c7d4a1abf981fb1ba557e21cad968 (patch)
tree75853ed8c38177117d6fa8c1cf7ca58d85793199 /load.c
parentbc96a45f12503956e323e6c2a47aa550ca1da3dc (diff)
downloadruby-e4d85d3a2d0c7d4a1abf981fb1ba557e21cad968.tar.gz
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.
Diffstat (limited to 'load.c')
-rw-r--r--load.c29
1 files changed, 1 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)
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
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 {