From 2494a712dd2f0036e1ea05b652a4331d3405eec3 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Fri, 28 Nov 2025 22:47:35 +0900
Subject: [PATCH] vm.c: extract alias resolution logic to
 MRB_PROC_RESOLVE_ALIAS macro

reduce code duplication by introducing MRB_PROC_RESOLVE_ALIAS macro
to handle alias proc resolution in a consistent way across 5 locations.

Co-authored-by: Claude <noreply@anthropic.com>
---
 src/vm.c | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/vm.c b/src/vm.c
index e8b2181c8..9ea39ddc9 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -268,6 +268,13 @@ mrb_vm_ci_proc_set(mrb_callinfo *ci, const struct RProc *p)
   CI_PROC_SET(ci, p);
 }
 
+#define MRB_PROC_RESOLVE_ALIAS(ci, p) do {\
+  if (MRB_PROC_ALIAS_P(p)) {\
+    (ci)->mid = (p)->body.mid;\
+    (p) = (p)->upper;\
+  }\
+} while (0)
+
 #define CI_TARGET_CLASS(ci) (((ci)->u.env && (ci)->u.env->tt == MRB_TT_ENV)? (ci)->u.env->c : (ci)->u.target_class)
 
 struct RClass*
@@ -825,10 +832,7 @@ mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, mrb_int argc
     }
     else {
       /* handle alias */
-      if (MRB_PROC_ALIAS_P(ci->proc)) {
-        ci->mid = ci->proc->body.mid;
-        ci->proc = ci->proc->upper;
-      }
+      MRB_PROC_RESOLVE_ALIAS(ci, ci->proc);
       ci->cci = CINFO_SKIP;
       val = mrb_run(mrb, ci->proc, self);
     }
@@ -883,10 +887,7 @@ exec_irep(mrb_state *mrb, mrb_value self, const struct RProc *p)
 
   ci->stack[0] = self;
   /* handle alias */
-  if (MRB_PROC_ALIAS_P(p)) {
-    ci->mid = p->body.mid;
-    p = p->upper;
-  }
+  MRB_PROC_RESOLVE_ALIAS(ci, p);
   CI_PROC_SET(ci, p);
   if (MRB_PROC_CFUNC_P(p)) {
     if (MRB_PROC_NOARG_P(p) && (ci->n > 0 || ci->nk > 0)) {
@@ -1036,10 +1037,7 @@ send_method(mrb_state *mrb, mrb_value self, mrb_bool pub)
   if (MRB_METHOD_PROC_P(m)) {
     p = MRB_METHOD_PROC(m);
     /* handle alias */
-    if (MRB_PROC_ALIAS_P(p)) {
-      ci->mid = p->body.mid;
-      p = p->upper;
-    }
+    MRB_PROC_RESOLVE_ALIAS(ci, p);
     CI_PROC_SET(ci, p);
   }
   if (MRB_METHOD_CFUNC_P(m)) {
@@ -2218,10 +2216,7 @@ RETRY_TRY_BLOCK:
       if (MRB_METHOD_PROC_P(m)) {
         const struct RProc *p = MRB_METHOD_PROC(m);
         /* handle alias */
-        if (MRB_PROC_ALIAS_P(p)) {
-          ci->mid = p->body.mid;
-          p = p->upper;
-        }
+        MRB_PROC_RESOLVE_ALIAS(ci, p);
         CI_PROC_SET(ci, p);
         if (!MRB_PROC_CFUNC_P(p)) {
           /* setup environment for calling method */
@@ -2270,11 +2265,8 @@ RETRY_TRY_BLOCK:
       const struct RProc *p = mrb_proc_ptr(recv);
 
       /* handle alias */
-      if (MRB_PROC_ALIAS_P(p)) {
-        ci->mid = p->body.mid;
-        p = p->upper;
-      }
-      else if (MRB_PROC_ENV_P(p)) {
+      MRB_PROC_RESOLVE_ALIAS(ci, p);
+      if (MRB_PROC_ENV_P(p)) {
         ci->mid = MRB_PROC_ENV(p)->mid;
       }
       /* replace callinfo */