Merge branch 'PHP-8.1'

dstogov · dstogov · commit b41bd9143ae3 · 2021-09-21T15:16:34.000+03:00
* PHP-8.1:
  JIT: Disable recursive call optimization for VM without global register variables (ARM64 part)
diff --git a/ext/opcache/jit/zend_jit_arm64.dasc b/ext/opcache/jit/zend_jit_arm64.dasc
@@ -9229,7 +9229,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
`@@ -9229,7 +9229,7 @@ static int zend_jit_do_fcall(dasm_State *Dst, const zend_op opline, const zend`
`9229`	`9229`	`}`
`9230`	`9230`	`}`
`9231`	`9231`
`9232`		`- if (!trace && op_array == &func->op_array`
	`9232`	`+ if (GCC_GLOBAL_REGS && !trace && op_array == &func->op_array`
`9233`	`9233`	`&& num_args >= op_array->required_num_args) {`
`9234`	`9234`	`/* recursive call */`
`9235`	`9235`	`if (ZEND_OBSERVER_ENABLED) {`