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

Merge branch 'PHP-8.0'

Browse Source 
* PHP-8.0:
  JIT: Fixed incorrect condition (this leaded to Zend/tests/type_declarations/typed_properties_083.phpt failure without PROFITABILITY_CHECKS)
This commit is contained in:
Dmitry Stogov
2021-05-21 00:02:46 +03:00
parent cb376d8f61 cce0cc8836
commit dc0e259154
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1839,7 +1839,7 @@ static int zend_jit_exception_handler_undef_stub(dasm_State **Dst)
| MEM_LOAD_ZTS ldr, REG0, executor_globals, opline_before_exception, REG0 | MEM_LOAD_ZTS ldr, REG0, executor_globals, opline_before_exception, REG0
| ldrb TMP1w, OP:REG0->result_type | ldrb TMP1w, OP:REG0->result_type
| TST_32_WITH_CONST TMP1w, (IS_TMP_VAR|IS_VAR), TMP2w | TST_32_WITH_CONST TMP1w, (IS_TMP_VAR|IS_VAR), TMP2w
| bne >1 | be >1
| ldr REG0w, OP:REG0->result.var | ldr REG0w, OP:REG0->result.var
| add REG0, REG0, FP | add REG0, REG0, FP
| SET_Z_TYPE_INFO REG0, IS_UNDEF, TMP1w | SET_Z_TYPE_INFO REG0, IS_UNDEF, TMP1w

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

@@ -1802,7 +1802,7 @@ static int zend_jit_exception_handler_undef_stub(dasm_State **Dst)
|->exception_handler_undef: |->exception_handler_undef:
| MEM_OP2_2_ZTS mov, r0, aword, executor_globals, opline_before_exception, r0 | MEM_OP2_2_ZTS mov, r0, aword, executor_globals, opline_before_exception, r0
| test byte OP:r0->result_type, (IS_TMP_VAR|IS_VAR) | test byte OP:r0->result_type, (IS_TMP_VAR|IS_VAR)
| jnz >1 | jz >1
| mov eax, dword OP:r0->result.var | mov eax, dword OP:r0->result.var
| SET_Z_TYPE_INFO FP + r0, IS_UNDEF | SET_Z_TYPE_INFO FP + r0, IS_UNDEF
|1: |1: