php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix GH-10635: ARM64 function JIT causes impossible assertion (#10638)

Browse Source
This commit is contained in:
Dmitry Stogov
2023-02-21 09:25:51 +03:00
committed by GitHub
parent 08e7591206
commit 70ff10af72
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/opcache/jit/zend_jit_arm64.dasc
View File

@@ -7722,7 +7722,6 @@ static int zend_jit_identical(dasm_State **Dst,
}
op1_addr = real_addr;
}
| LOAD_ZVAL_ADDR FCARG1x, op1_addr
}
if (opline->op2_type != IS_CONST) {
if (Z_MODE(op2_addr) == IS_REG) {
@@ -7734,6 +7733,9 @@ static int zend_jit_identical(dasm_State **Dst,
}
| LOAD_ZVAL_ADDR FCARG2x, op2_addr
}
if (opline->op1_type != IS_CONST) {
| LOAD_ZVAL_ADDR FCARG1x, op1_addr
}
}
if ((op1_info & op2_info & MAY_BE_ANY) == 0) {

4
ext/opcache/jit/zend_jit_x86.dasc
View File

@@ -8309,7 +8309,6 @@ static int zend_jit_identical(dasm_State **Dst,
}
op1_addr = real_addr;
}
| LOAD_ZVAL_ADDR FCARG1a, op1_addr
}
if (opline->op2_type != IS_CONST) {
if (Z_MODE(op2_addr) == IS_REG) {
@@ -8321,6 +8320,9 @@ static int zend_jit_identical(dasm_State **Dst,
}
| LOAD_ZVAL_ADDR FCARG2a, op2_addr
}
if (opline->op1_type != IS_CONST) {
| LOAD_ZVAL_ADDR FCARG1a, op1_addr
}
}
if ((op1_info & op2_info & MAY_BE_ANY) == 0) {

19
ext/opcache/tests/jit/identical_003.phpt Normal file
View File

@@ -0,0 +1,19 @@
--TEST--
JIT IDENTICAL: 003 register allocation
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.file_update_protection=0
opcache.jit_buffer_size=1M
opcache.protect_memory=1
--EXTENSIONS--
opcache
--FILE--
<?php
function foo(array $a, int|float $n) {
var_dump(count($a) === $n);
}
foo([1], 1);
?>
--EXPECT--
bool(true)