1 files changed, 7 insertions, 0 deletions
diff --git a/variable.c b/variable.c
index be0eee1df3..616c4852c0 100644
--- a/variable.c
+++ b/variable.c
@@ -2332,10 +2332,17 @@ rb_autoload_load(VALUE mod, ID id)
 VALUE
 rb_autoload_p(VALUE mod, ID id)
 {
+    return rb_autoload_at_p(mod, id, Qtrue);
+}
+
+VALUE
+rb_autoload_at_p(VALUE mod, ID id, VALUE recur)
+{
     VALUE load;
     struct autoload_data_i *ele;
 
     while (!autoload_defined_p(mod, id)) {
+	if (!RTEST(recur)) return Qnil;
 	mod = RCLASS_SUPER(mod);
 	if (!mod) return Qnil;
     }