mirror of
https://github.com/php/php-src.git
synced 2026-04-29 19:23:22 +02:00
Merge branch 'PHP-8.1'
* PHP-8.1: JIT: Eliminate useless exception check
This commit is contained in:
@@ -12331,14 +12331,16 @@ static int zend_jit_fetch_obj(dasm_State **Dst,
|
||||
| EXT_CALL zend_jit_extract_helper, REG0
|
||||
|1:
|
||||
} else if (!op1_avoid_refcounting) {
|
||||
if (on_this) {
|
||||
op1_info &= ~MAY_BE_RC1;
|
||||
}
|
||||
| FREE_OP opline->op1_type, opline->op1, op1_info, 1, opline, ZREG_TMP1, ZREG_TMP2
|
||||
}
|
||||
}
|
||||
|
||||
if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE
|
||||
&& prop_info
|
||||
&& opline->op1_type != IS_VAR
|
||||
&& opline->op1_type != IS_TMP_VAR) {
|
||||
&& (!(opline->op1_type & (IS_VAR|IS_TMP_VAR)) || on_this || op1_indirect)) {
|
||||
may_throw = 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -13036,14 +13036,16 @@ static int zend_jit_fetch_obj(dasm_State **Dst,
|
||||
| EXT_CALL zend_jit_extract_helper, r0
|
||||
|1:
|
||||
} else if (!op1_avoid_refcounting) {
|
||||
if (on_this) {
|
||||
op1_info &= ~MAY_BE_RC1;
|
||||
}
|
||||
| FREE_OP opline->op1_type, opline->op1, op1_info, 1, opline
|
||||
}
|
||||
}
|
||||
|
||||
if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE
|
||||
&& prop_info
|
||||
&& opline->op1_type != IS_VAR
|
||||
&& opline->op1_type != IS_TMP_VAR) {
|
||||
&& (!(opline->op1_type & (IS_VAR|IS_TMP_VAR)) || on_this || op1_indirect)) {
|
||||
may_throw = 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user