1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Bug #18173] Update loaded_features_index

Browse Source 
If $LOADED_FEATURES is changed in the just required file, also the
index table needs to be updated before loaded_features_snapshot is
reset.  If the snapshot is reset without updating the table, the
name of the added feature will not be found.
This commit is contained in:
Nobuyoshi Nakada 2021-09-14 00:57:05 +09:00
parent 5f1385bec0
commit ddb32e6616
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
Notes: git 2021-09-16 19:43:35 +09:00 
Merged: https://github.com/ruby/ruby/pull/4849
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
load.c
View File

@ -598,6 +598,7 @@ rb_provide_feature(VALUE feature)
} }
rb_str_freeze(feature); rb_str_freeze(feature);
get_loaded_features_index();
rb_ary_push(features, rb_fstring(feature)); rb_ary_push(features, rb_fstring(feature));
features_index_add(feature, INT2FIX(RARRAY_LEN(features)-1)); features_index_add(feature, INT2FIX(RARRAY_LEN(features)-1));
reset_loaded_features_snapshot(); reset_loaded_features_snapshot();

17
test/ruby/test_require.rb
View File

@ -839,6 +839,23 @@ class TestRequire < Test::Unit::TestCase
} }
end end
def test_provide_in_required_file
paths, loaded = $:.dup, $".dup
Dir.mktmpdir do |tmp|
provide = File.realdirpath("provide.rb", tmp)
File.write(File.join(tmp, "target.rb"), "raise __FILE__\n")
File.write(provide, '$" << '"'target.rb'\n")
$:.replace([tmp])
assert(require("provide"))
assert(!require("target"))
assert_equal($".pop, provide)
assert_equal($".pop, "target.rb")
end
ensure
$:.replace(paths)
$".replace(loaded)
end
if defined?($LOAD_PATH.resolve_feature_path) if defined?($LOAD_PATH.resolve_feature_path)
def test_resolve_feature_path def test_resolve_feature_path
paths, loaded = $:.dup, $".dup paths, loaded = $:.dup, $".dup