Merge branch 'PHP-8.0' into PHP-8.1

dstogov · dstogov · commit 2d8ce2f993be · 2021-09-21T14:33:09.000+03:00
* PHP-8.0:
  JIT: Disable recursive call optimization for VM without global register variables
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -9866,7 +9866,7 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend
 						}
 					}
 
-					if (!trace && op_array == &func->op_array
+					if (GCC_GLOBAL_REGS && !trace && op_array == &func->op_array
 							&& num_args >= op_array->required_num_args) {
 						/* recursive call */
 						if (ZEND_OBSERVER_ENABLED) {

Original file line number	Diff line number	Diff line change
`@@ -9866,7 +9866,7 @@ static int zend_jit_do_fcall(dasm_State *Dst, const zend_op opline, const zend`
`9866`	`9866`	`}`
`9867`	`9867`	`}`
`9868`	`9868`
`9869`		`- if (!trace && op_array == &func->op_array`
	`9869`	`+ if (GCC_GLOBAL_REGS && !trace && op_array == &func->op_array`
`9870`	`9870`	`&& num_args >= op_array->required_num_args) {`
`9871`	`9871`	`/* recursive call */`
`9872`	`9872`	`if (ZEND_OBSERVER_ENABLED) {`