Merge branch 'PHP-8.1' into PHP-8.2

dstogov · dstogov · commit 5a276bf47855 · 2023-10-09T23:07:39.000+03:00
* PHP-8.1: Fix GH-12364: JIT leak in Symfony TranslationDebugCommandTest (#12394)
diff --git a/ext/opcache/jit/zend_jit_arm64.dasc b/ext/opcache/jit/zend_jit_arm64.dasc
@@ -14428,8 +14428,6 @@ static int zend_jit_fe_fetch(dasm_State **Dst, const zend_op *opline, uint32_t o
 		if (exit_addr) {
 			if (exit_opcode == ZEND_JMP) {
 				|	b &exit_addr
-			} else {
-				|	b >3
 			}
 		} else {
 			|	b =>target_label
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -15396,8 +15396,6 @@ static int zend_jit_fe_fetch(dasm_State **Dst, const zend_op *opline, uint32_t o
 		if (exit_addr) {
 			if (exit_opcode == ZEND_JMP) {
 				|	jmp &exit_addr
-			} else {
-				|	jmp >3
 			}
 		} else {
 			|	jmp =>target_label

Original file line number	Diff line number	Diff line change
`@@ -14428,8 +14428,6 @@ static int zend_jit_fe_fetch(dasm_State *Dst, const zend_op opline, uint32_t o`
`14428`	`14428`	`if (exit_addr) {`
`14429`	`14429`	`if (exit_opcode == ZEND_JMP) {`
`14430`	`14430`	`\| b &exit_addr`
`14431`		`- } else {`
`14432`		`- \| b >3`
`14433`	`14431`	`}`
`14434`	`14432`	`} else {`
`14435`	`14433`	`\| b =>target_label`
Original file line number	Diff line number	Diff line change
`@@ -15396,8 +15396,6 @@ static int zend_jit_fe_fetch(dasm_State *Dst, const zend_op opline, uint32_t o`
`15396`	`15396`	`if (exit_addr) {`
`15397`	`15397`	`if (exit_opcode == ZEND_JMP) {`
`15398`	`15398`	`\| jmp &exit_addr`
`15399`		`- } else {`
`15400`		`- \| jmp >3`
`15401`	`15399`	`}`
`15402`	`15400`	`} else {`
`15403`	`15401`	`\| jmp =>target_label`