Attempt to fix [Backport #21567]

k0kubun · k0kubun · commit 09c067014fa2 · 2025-09-12T15:24:16.000-07:00
diff --git a/load.c b/load.c
@@ -410,8 +410,8 @@ get_loaded_features_index(rb_vm_t *vm)
             features_index_add(vm, as_str, INT2FIX(i));
         }
         /* The user modified $LOADED_FEATURES, so we should restore the changes. */
-        if (!rb_ary_shared_with_p(features, CURRENT_NS_LOADED_FEATURES(vm_ns))) {
-            rb_ary_replace(CURRENT_NS_LOADED_FEATURES(vm_ns), features);
+        if (!rb_ary_shared_with_p(features, vm->loaded_features)) {
+            rb_ary_replace(vm->loaded_features, features);
         }
         reset_loaded_features_snapshot(vm);
 

Original file line number	Diff line number	Diff line change
`@@ -410,8 +410,8 @@ get_loaded_features_index(rb_vm_t *vm)`
`410`	`410`	`features_index_add(vm, as_str, INT2FIX(i));`
`411`	`411`	`}`
`412`	`412`	`/* The user modified $LOADED_FEATURES, so we should restore the changes. */`
`413`		`- if (!rb_ary_shared_with_p(features, CURRENT_NS_LOADED_FEATURES(vm_ns))) {`
`414`		`- rb_ary_replace(CURRENT_NS_LOADED_FEATURES(vm_ns), features);`
	`413`	`+ if (!rb_ary_shared_with_p(features, vm->loaded_features)) {`
	`414`	`+ rb_ary_replace(vm->loaded_features, features);`
`415`	`415`	`}`
`416`	`416`	`reset_loaded_features_snapshot(vm);`
`417`	`417`