kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Avoid pointless attempts to open .so file if already required

Browse source 
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]
This commit is contained in:
Jeremy Evans 2021-07-27 13:55:21 -07:00 • committed by Nobuyoshi Nakada
parent 30d0e5d1ae
commit 345db8f2aa
Notes: git 2021-07-28 12:30:11 +09:00
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
load.c
View file

@ -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,
@ -963,7 +968,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)