Merge branch 'PHP-8.0'

dstogov · dstogov · commit c945c399aa80 · 2021-05-12T02:09:14.000+03:00
* PHP-8.0:
  Fixed incorrect stack size calculation (sizeof(zval) == 16)
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -8790,7 +8790,7 @@ static int zend_jit_push_call_frame(dasm_State **Dst, const zend_op *opline, con
 			|	sub edx, dword [r0 + offsetof(zend_closure, func.op_array.last_var)]
 			|	sub edx, dword [r0 + offsetof(zend_closure, func.op_array.T)]
 		}
-		|	shl edx, 5
+		|	shl edx, 4
 		|.if X64
 			|	movsxd r2, edx
 		|.endif

Original file line number	Diff line number	Diff line change
`@@ -8790,7 +8790,7 @@ static int zend_jit_push_call_frame(dasm_State *Dst, const zend_op opline, con`
`8790`	`8790`	`\| sub edx, dword [r0 + offsetof(zend_closure, func.op_array.last_var)]`
`8791`	`8791`	`\| sub edx, dword [r0 + offsetof(zend_closure, func.op_array.T)]`
`8792`	`8792`	`}`
`8793`		`- \| shl edx, 5`
	`8793`	`+ \| shl edx, 4`
`8794`	`8794`	`\|.if X64`
`8795`	`8795`	`\| movsxd r2, edx`
`8796`	`8796`	`\|.endif`