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

Merge branch 'PHP-8.0' into PHP-8.1

Browse Source 
* PHP-8.0:
  JIT: Fix missing type store
This commit is contained in:
Dmitry Stogov
2022-03-21 14:07:34 +03:00
parent 2198493f12 e9fc81a2f8
commit 21b0da8cdf
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ext/opcache/jit/zend_jit_trace.c
View File

@@ -4982,9 +4982,16 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
res_use_info = zend_jit_trace_type_to_info(
STACK_MEM_TYPE(stack, EX_VAR_TO_NUM(opline->result.var)))
& (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG|MAY_BE_DOUBLE);
res_addr = RES_REG_ADDR();
if (Z_MODE(res_addr) != IS_REG &&
STACK_TYPE(stack, EX_VAR_TO_NUM(opline->result.var)) !=
STACK_MEM_TYPE(stack, EX_VAR_TO_NUM(opline->result.var))) {
/* type may be not set */
res_use_info |= MAY_BE_NULL;
}
if (!zend_jit_qm_assign(&dasm_state, opline,
op1_info, op1_addr, op1_def_addr,
res_use_info, res_info, RES_REG_ADDR())) {
res_use_info, res_info, res_addr)) {
goto jit_failure;
}
if (opline->op1_type == IS_CV

26
ext/opcache/tests/jit/qm_assign_003.phpt Normal file
View File

@@ -0,0 +1,26 @@
--TEST--
JIT QM_ASSIGN: 003 missing type store
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.file_update_protection=0
opcache.jit_buffer_size=1M
--FILE--
<?php
function foo() {
for($cnt2=0;$cnt<6;$cnt++) {
$a &= 15;
$a = "4294967295";
$a *= $a;
for ($i = 0; $i <= .1; $i++) {
for ($i = 0; $i << .1; $i++) {
$a &= $a . $a = "4294967295";
}
}
}
}
@foo();
?>
DONE
--EXPECT--
DONE