Merge branch 'PHP-8.2' into PHP-8.3

dstogov · dstogov · commit 8fa3539cbf9e · 2023-10-09T23:07:45.000+03:00
* PHP-8.2: 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
@@ -14473,8 +14473,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
@@ -15445,8 +15445,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
`@@ -14473,8 +14473,6 @@ static int zend_jit_fe_fetch(dasm_State *Dst, const zend_op opline, uint32_t o`
`14473`	`14473`	`if (exit_addr) {`
`14474`	`14474`	`if (exit_opcode == ZEND_JMP) {`
`14475`	`14475`	`\| b &exit_addr`
`14476`		`- } else {`
`14477`		`- \| b >3`
`14478`	`14476`	`}`
`14479`	`14477`	`} else {`
`14480`	`14478`	`\| b =>target_label`
Original file line number	Diff line number	Diff line change
`@@ -15445,8 +15445,6 @@ static int zend_jit_fe_fetch(dasm_State *Dst, const zend_op opline, uint32_t o`
`15445`	`15445`	`if (exit_addr) {`
`15446`	`15446`	`if (exit_opcode == ZEND_JMP) {`
`15447`	`15447`	`\| jmp &exit_addr`
`15448`		`- } else {`
`15449`		`- \| jmp >3`
`15450`	`15448`	`}`
`15451`	`15449`	`} else {`
`15452`	`15450`	`\| jmp =>target_label`