From 2ad3f0e34b7d66ed86961e5a586f581ffe7d93c3 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Fri, 26 May 2023 11:17:51 +0900
Subject: [PATCH] vm.c (mrb_yield_with_class): keep `mid` of the callee

Otherwise `super` from within blocks may call wrong methods.
---
 src/vm.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/vm.c b/src/vm.c
index a1f31d1d5..7f05c5d5a 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -976,7 +976,7 @@ MRB_API mrb_value
 mrb_yield_with_class(mrb_state *mrb, mrb_value b, mrb_int argc, const mrb_value *argv, mrb_value self, struct RClass *c)
 {
   struct RProc *p;
-  mrb_sym mid = mrb->c->ci->mid;
+  mrb_sym mid;
   mrb_callinfo *ci;
   mrb_value val;
   mrb_int n;
@@ -985,6 +985,12 @@ mrb_yield_with_class(mrb_state *mrb, mrb_value b, mrb_int argc, const mrb_value
   ci = mrb->c->ci;
   n = mrb_ci_nregs(ci);
   p = mrb_proc_ptr(b);
+  if (MRB_PROC_ENV_P(p)) {
+    mid = p->e.env->mid;
+  }
+  else {
+    mid = ci->mid;
+  }
   ci = cipush(mrb, n, CINFO_DIRECT, NULL, NULL, NULL, mid, 0);
   funcall_args_capture(mrb, 0, argc, argv, mrb_nil_value(), ci);
   ci->u.target_class = c;