Fixed GH-12584: Assertion `ctx->control' failed with new JIT and CALL

dstogov · dstogov · commit 1b846f89b965 · 2023-11-01T17:19:17.000+03:00
VM`
diff --git a/ext/opcache/jit/zend_jit_ir.c b/ext/opcache/jit/zend_jit_ir.c
@@ -16354,6 +16354,7 @@ static int zend_jit_trace_return(zend_jit_ctx *jit, bool original_handler, const
 			  || opline->opcode == ZEND_YIELD
 			  || opline->opcode == ZEND_YIELD_FROM)) {
 				ir_RETURN(ref);
+				return 1;
 			}
 		}
 		ir_RETURN(ir_CONST_I32(2)); // ZEND_VM_LEAVE

Original file line number	Diff line number	Diff line change
`@@ -16354,6 +16354,7 @@ static int zend_jit_trace_return(zend_jit_ctx *jit, bool original_handler, const`
`16354`	`16354`	`\|\| opline->opcode == ZEND_YIELD`
`16355`	`16355`	`\|\| opline->opcode == ZEND_YIELD_FROM)) {`
`16356`	`16356`	`ir_RETURN(ref);`
	`16357`	`+ return 1;`
`16357`	`16358`	`}`
`16358`	`16359`	`}`
`16359`	`16360`	`ir_RETURN(ir_CONST_I32(2)); // ZEND_VM_LEAVE`