Use RB_BUILTIN_TYPE in RCLASS_SINGLETON_P

jhawthorn · jhawthorn · commit 202114608b6c · 2026-04-06T15:36:54.000-07:00
This should avoid us emitting the check for a special constant.
diff --git a/class.c b/class.c
@@ -2630,7 +2630,7 @@ rb_obj_singleton_methods(int argc, const VALUE *argv, VALUE obj)
     int recur = TRUE;
 
     if (rb_check_arity(argc, 0, 1)) recur = RTEST(argv[0]);
-    if (RCLASS_SINGLETON_P(obj)) {
+    if (RB_TYPE_P(obj, T_CLASS) && RCLASS_SINGLETON_P(obj)) {
         rb_singleton_class(obj);
     }
     klass = CLASS_OF(obj);
diff --git a/internal/class.h b/internal/class.h
@@ -491,7 +491,8 @@ RUBY_SYMBOL_EXPORT_END
 static inline bool
 RCLASS_SINGLETON_P(VALUE klass)
 {
-    return RB_TYPE_P(klass, T_CLASS) && FL_TEST_RAW(klass, FL_SINGLETON);
+    RUBY_ASSERT(RB_TYPE_P(klass, T_CLASS) || RB_TYPE_P(klass, T_MODULE) || RB_TYPE_P(klass, T_ICLASS));
+    return RB_BUILTIN_TYPE(klass) == T_CLASS && FL_TEST_RAW(klass, FL_SINGLETON);
 }
 
 static inline void

Original file line number	Diff line number	Diff line change
`@@ -2630,7 +2630,7 @@ rb_obj_singleton_methods(int argc, const VALUE *argv, VALUE obj)`
`2630`	`2630`	`int recur = TRUE;`
`2631`	`2631`
`2632`	`2632`	`if (rb_check_arity(argc, 0, 1)) recur = RTEST(argv[0]);`
`2633`		`- if (RCLASS_SINGLETON_P(obj)) {`
	`2633`	`+ if (RB_TYPE_P(obj, T_CLASS) && RCLASS_SINGLETON_P(obj)) {`
`2634`	`2634`	`rb_singleton_class(obj);`
`2635`	`2635`	`}`
`2636`	`2636`	`klass = CLASS_OF(obj);`
Original file line number	Diff line number	Diff line change
`@@ -491,7 +491,8 @@ RUBY_SYMBOL_EXPORT_END`
`491`	`491`	`static inline bool`
`492`	`492`	`RCLASS_SINGLETON_P(VALUE klass)`
`493`	`493`	`{`
`494`		`- return RB_TYPE_P(klass, T_CLASS) && FL_TEST_RAW(klass, FL_SINGLETON);`
	`494`	`+ RUBY_ASSERT(RB_TYPE_P(klass, T_CLASS) \|\| RB_TYPE_P(klass, T_MODULE) \|\| RB_TYPE_P(klass, T_ICLASS));`
	`495`	`+ return RB_BUILTIN_TYPE(klass) == T_CLASS && FL_TEST_RAW(klass, FL_SINGLETON);`
`495`	`496`	`}`
`496`	`497`
`497`	`498`	`static inline void`