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

Fixed trace type inference

Browse Source
This commit is contained in:
Dmitry Stogov
2023-11-27 22:52:12 +03:00
parent 26b4130f4a
commit 8f5156fcba
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1862,6 +1862,14 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
ADD_OP1_TRACE_GUARD();
}
break;
case ZEND_ADD:
case ZEND_SUB:
case ZEND_MUL:
// case ZEND_DIV: // TODO: check for division by zero ???
if (orig_op1_type == IS_UNDEF || orig_op2_type == IS_UNDEF) {
break;
}
ZEND_FALLTHROUGH;
case ZEND_IS_EQUAL:
case ZEND_IS_NOT_EQUAL:
case ZEND_IS_SMALLER:
@@ -1876,10 +1884,6 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
case ZEND_SL:
case ZEND_SR:
case ZEND_MOD:
case ZEND_ADD:
case ZEND_SUB:
case ZEND_MUL:
// case ZEND_DIV: // TODO: check for division by zero ???
ADD_OP2_TRACE_GUARD();
ZEND_FALLTHROUGH;
case ZEND_ECHO:

22
ext/opcache/tests/jit/add_015.phpt Normal file
View File

@@ -0,0 +1,22 @@
--TEST--
JIT ADD: 014 incorrect guard elimination
--INI--
opcache.enable=1
opcache.enable_cli=1
--FILE--
<?php
function test() {
$j = 0;
for ($i = 0; $i < 41; $i++) {
$a &= $a &= $aZ - $a;
$aZ = $a;
$a &= $a &= $aZ = $a;
$aZ = $a;
$a = &$a + $e = $a-- +$a &= $a &= $a &= $aZ = $a;
}
}
@test();
?>
DONE
--EXPECT--
DONE