1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Fast object is iclass checks"

Browse Source 
This reverts commit 1b15756d24c11ed6bfddb5ae53402a071a20ea97.
This commit is contained in:
John Hawthorn 2022-03-10 11:06:29 -08:00
parent edc8576a65
commit 82dea29073
Notes: git 2022-03-11 04:07:02 +09:00 
Merged: https://github.com/ruby/ruby/pull/5639
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
object.c
View File

@ -817,32 +817,18 @@ rb_obj_is_kind_of(VALUE obj, VALUE c)
// class without checking type and can return immediately. // class without checking type and can return immediately.
if (cl == c) return Qtrue; if (cl == c) return Qtrue;
// Fast path: Both are T_CLASS
if (LIKELY(RB_TYPE_P(c, T_CLASS))) {
return class_search_class_ancestor(cl, c);
}
// Note: YJIT needs this function to never allocate and never raise when // Note: YJIT needs this function to never allocate and never raise when
// `c` is a class or a module. // `c` is a class or a module.
c = class_or_module_required(c);
c = RCLASS_ORIGIN(c);
if (LIKELY(RB_TYPE_P(c, T_CLASS))) { // Slow path: check each ancestor in the linked list and its method table
// Fast path: Both are T_CLASS return RBOOL(class_search_ancestor(cl, c));
return class_search_class_ancestor(cl, c);
} else if (RB_TYPE_P(c, T_ICLASS)) {
// First check if we inherit the includer
// If we do we can return true immediately
VALUE includer = RCLASS_INCLUDER(c);
RUBY_ASSERT(RB_TYPE_P(includer, T_CLASS));
if (cl == includer) return Qtrue;
if(class_search_class_ancestor(cl, includer))
return Qtrue;
// We don't include the ICLASS directly, but must check if we inherit
// the module via another include
return RBOOL(class_search_ancestor(cl, RCLASS_ORIGIN(c)));
} else if (RB_TYPE_P(c, T_MODULE)) {
// Slow path: check each ancestor in the linked list and its method table
return RBOOL(class_search_ancestor(cl, RCLASS_ORIGIN(c)));
} else {
rb_raise(rb_eTypeError, "class or module required");
UNREACHABLE_RETURN(Qfalse);
}
} }