summaryrefslogtreecommitdiff
path: root/load.c
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2021-08-01 18:30:39 +0900
committernagachika <nagachika@ruby-lang.org>2021-08-01 18:30:39 +0900
commit6f4ab641bb1035c5811e42e43320112e4a502a0e (patch)
tree5a389fdaa90a32ad0755483f2f215b33f7a6a401 /load.c
parent0dbb3c15dbe9b7693ea362c94ed8939d20cba083 (diff)
merge revision(s) 345db8f2aa373a31c619c8f85bd372f0a20829c1: [Backport #10902]
Avoid pointless attempts to open .so file if already required When attempting to require a file without an extension that has already been required or provided with an .so extension, only look for files with an .rb extension. There is no point in trying to find files with an .so extension, since we already know one has been loaded. Previously, attempting to require such a file scanned the load path twice, once for .rb and once for .so. Now it only scans once for .rb. The scan once for .rb cannot be avoided, since the .rb file would take precedence and should be loaded if it exists. Fixes [Bug #10902] --- load.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
Diffstat (limited to 'load.c')
-rw-r--r--load.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/load.c b/load.c
index cb6b1fa14f..2d931b91f0 100644
--- a/load.c
+++ b/load.c
@@ -35,6 +35,11 @@ static const char *const loadable_ext[] = {
0
};
+static const char *const ruby_ext[] = {
+ ".rb",
+ 0
+};
+
enum expand_type {
EXPAND_ALL,
EXPAND_RELATIVE,
@@ -964,7 +969,7 @@ search_required(VALUE fname, volatile VALUE *path, feature_func rb_feature_p)
return 'r';
}
tmp = fname;
- type = rb_find_file_ext(&tmp, loadable_ext);
+ type = rb_find_file_ext(&tmp, ft == 's' ? ruby_ext : loadable_ext);
switch (type) {
case 0:
if (ft)