File tree Expand file tree Collapse file tree 1 file changed +5
-3
lines changed
src/main/ruby/truffleruby/core Expand file tree Collapse file tree 1 file changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -203,7 +203,7 @@ def abort(msg = nil)
203
203
204
204
def autoload ( name , file )
205
205
nesting = Primitive . caller_nesting
206
- mod = nesting . first || ( Primitive . equal? ( Kernel , self ) ? Kernel : Object )
206
+ mod = nesting . first || Object
207
207
if Primitive . equal? ( mod , self )
208
208
super ( name , file ) # Avoid recursion
209
209
else
@@ -213,10 +213,12 @@ def autoload(name, file)
213
213
module_function :autoload
214
214
215
215
def autoload? ( name )
216
- if Primitive . equal? ( Kernel , self )
216
+ nesting = Primitive . caller_nesting
217
+ mod = nesting . first || Object
218
+ if Primitive . equal? ( mod , self )
217
219
super ( name ) # Avoid recursion
218
220
else
219
- Object . autoload? ( name )
221
+ mod . autoload? ( name )
220
222
end
221
223
end
222
224
module_function :autoload?
You can’t perform that action at this time.
0 commit comments