Merge pull request #6126 from dearblue/block-return

matz · web-flow · commit 1ac4148020e5 · 2023-12-27T22:19:36.000+09:00
Fixed return value of `OP_RETURN_BLK` called directly under C function
diff --git a/src/vm.c b/src/vm.c
@@ -2300,7 +2300,7 @@ mrb_vm_exec(mrb_state *mrb, const struct RProc *proc, const mrb_code *pc)
 
       mrb_callinfo *ci = mrb->c->ci;
 
-      if (ci->cci != CINFO_NONE || !MRB_PROC_ENV_P(proc) || MRB_PROC_STRICT_P(proc)) {
+      if (!MRB_PROC_ENV_P(proc) || MRB_PROC_STRICT_P(proc)) {
         goto NORMAL_RETURN;
       }
 

Original file line number	Diff line number	Diff line change
`@@ -2300,7 +2300,7 @@ mrb_vm_exec(mrb_state mrb, const struct RProc proc, const mrb_code *pc)`
`2300`	`2300`
`2301`	`2301`	`mrb_callinfo *ci = mrb->c->ci;`
`2302`	`2302`
`2303`		`- if (ci->cci != CINFO_NONE \|\| !MRB_PROC_ENV_P(proc) \|\| MRB_PROC_STRICT_P(proc)) {`
	`2303`	`+ if (!MRB_PROC_ENV_P(proc) \|\| MRB_PROC_STRICT_P(proc)) {`
`2304`	`2304`	`goto NORMAL_RETURN;`
`2305`	`2305`	`}`
`2306`	`2306`