admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vm.c: target_class should be retrieved from callinfo.

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2022-04-22 08:57:19 +09:00
parent 4afbf8ff01
commit 8bd77ca332
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+2 -5
View File
@@ -1739,7 +1739,7 @@ RETRY_TRY_BLOCK:
mrb_value recv, blk;
const struct RProc *p = ci->proc;
mrb_sym mid = ci->mid;
struct RClass* target_class = MRB_PROC_TARGET_CLASS(p);
struct RClass* target_class = mrb_vm_ci_target_class(ci);
if (MRB_PROC_ENV_P(p) && p->e.env->mid && p->e.env->mid != mid) { /* alias support */
mid = p->e.env->mid; /* restore old mid */
@@ -1751,10 +1751,7 @@ RETRY_TRY_BLOCK:
goto L_RAISE;
}
if ((target_class->flags & MRB_FL_CLASS_IS_PREPENDED) || target_class->tt == MRB_TT_MODULE) {
target_class = mrb_vm_ci_target_class(ci);
if (!target_class || target_class->tt != MRB_TT_ICLASS) {
goto super_typeerror;
}
goto super_typeerror;
}
recv = regs[0];
if (!mrb_obj_is_kind_of(mrb, recv, target_class)) {