diff options
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 609e620151..38af0db5a7 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1252,15 +1252,18 @@ vm_get_cvar_base(NODE *cref) return klass; } -static int -vm_const_defined_at(VALUE cbase, ID id, int newclass) +static VALUE +vm_search_const_defined_class(const VALUE cbase, ID id) { - int ret = rb_const_defined_at(cbase, id); - if (!ret && !newclass) { - while ((cbase = RCLASS_SUPER(cbase)) != 0 && cbase != rb_cObject && - !(ret = rb_const_defined_at(cbase, id))); + if (rb_const_defined_at(cbase, id)) return cbase; + if (cbase == rb_cObject) { + VALUE tmp = RCLASS_SUPER(cbase); + while (tmp) { + if (rb_const_defined_at(tmp, id)) return tmp; + tmp = RCLASS_SUPER(tmp); + } } - return ret; + return 0; } #ifndef USE_IC_FOR_IVAR |