From 85143cab00f41efa2cc566cd6485a79c64bd9bf3 Mon Sep 17 00:00:00 2001 From: naruse Date: Sun, 25 Feb 2018 00:36:43 +0000 Subject: merge revision(s) 62071: [Backport #14407] defined? returns nil for toplevel constant lookup * variable.c (rb_const_defined_0): toplevel constant lookup has been removed, should return nil too. [ruby-core:85142] [Bug #14407] [Fix GH-1800] From: Gonzalo git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@62568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- variable.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'variable.c') diff --git a/variable.c b/variable.c index 310ef74d13..52ea6b4cab 100644 --- a/variable.c +++ b/variable.c @@ -2515,6 +2515,11 @@ rb_const_defined_0(VALUE klass, ID id, int exclude, int recurse, int visibility) if (ce->value == Qundef && !check_autoload_required(tmp, id, 0) && !rb_autoloading_value(tmp, id, 0)) return (int)Qfalse; + + if (exclude && tmp == rb_cObject && klass != rb_cObject) { + return (int)Qfalse; + } + return (int)Qtrue; } if (!recurse) break; -- cgit v1.2.3