From 3c4f6501b08890107f0f3f3b8951f5508f697395 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Sat, 8 Mar 2025 07:54:51 +0900
Subject: [PATCH] class.c (find_visibility_ci): inline find_ci_from_proc()

---
 src/class.c | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/class.c b/src/class.c
index af26492f5..4d26f5c35 100644
--- a/src/class.c
+++ b/src/class.c
@@ -744,18 +744,6 @@ mrb_define_class_under(mrb_state *mrb, struct RClass *outer, const char *name, s
 
 #define CI_TARGET_CLASS(ci) (((ci)->u.env && (ci)->u.env->tt == MRB_TT_ENV)? (ci)->u.env->c : (ci)->u.target_class)
 
-static mrb_callinfo*
-find_ci_from_proc(const struct RProc *p, mrb_callinfo *ci, const mrb_callinfo *cibase)
-{
-  if (ci == cibase) return NULL;
-  ci--;
-  while (cibase < ci) {
-    if (ci->proc == p) break;
-    ci--;
-  }
-  return ci;
-}
-
 static mrb_callinfo*
 find_visibility_ci(mrb_state *mrb, const struct RClass *c, int n)
 {
@@ -767,11 +755,18 @@ find_visibility_ci(mrb_state *mrb, const struct RClass *c, int n)
   if (c == NULL) c = CI_TARGET_CLASS(ci);
   while (p->upper && cibase < ci) {
     p = p->upper;
-    mrb_callinfo *nci = find_ci_from_proc(p, ci, cibase);
-    if (nci == NULL || CI_TARGET_CLASS(nci) != c) {
-      return ci;
+
+    mrb_callinfo *upper_ci = ci - 1;
+    while (cibase < upper_ci) {
+      if (upper_ci->proc == p) {
+        if (CI_TARGET_CLASS(upper_ci) != c) {
+          return ci;
+        }
+        ci = upper_ci;
+        break;
+      }
+      upper_ci--;
     }
-    ci = nci;
   }
   return ci;
 }