php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-11 18:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0' into PHP-8.1

Browse Source 
* PHP-8.0:
  JIT: Fix register clobbering
This commit is contained in:
Dmitry Stogov
2022-03-21 16:13:04 +03:00
parent 21b0da8cdf cf83bdd925
commit 62a1c068fe
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15162,6 +15162,9 @@ static zend_regset zend_jit_get_scratch_regset(const zend_op *opline, const zend
if (op1_info & MAY_BE_DOUBLE) {
regset = ZEND_REGSET(ZREG_FPR0);
}
if (opline->result_type != IS_UNUSED && (op1_info & MAY_BE_LONG)) {
ZEND_REGSET_INCL(regset, ZREG_REG1);
}
}
break;
case ZEND_ADD:

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

@@ -16074,6 +16074,9 @@ static zend_regset zend_jit_get_scratch_regset(const zend_op *opline, const zend
if (op1_info & MAY_BE_DOUBLE) {
regset = ZEND_REGSET(ZREG_XMM0);
}
if (opline->result_type != IS_UNUSED && (op1_info & MAY_BE_LONG)) {
ZEND_REGSET_INCL(regset, ZREG_R1);
}
}
break;
case ZEND_ADD:

21
ext/opcache/tests/jit/reg_alloc_014.phpt Normal file
View File

@@ -0,0 +1,21 @@
--TEST--
Register Alloction 014: Register clobbering
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.file_update_protection=0
opcache.jit_buffer_size=1M
--FILE--
<?php
function foo() {
for($cnt = 0; $cnt < 6; $cnt++) {
$e = $a-- + $a-- + $a *= $a;
for ($i = 0; $i <= .1; $i++);
}
}
foo();
?>
DONE
--EXPECTF--
Warning: Undefined variable $a in %sreg_alloc_014.php on line 4
DONE