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

Merge branch 'PHP-8.0'

Browse Source 
* PHP-8.0:
  Stop on fake frame
  Fixed reference-counting propagation
This commit is contained in:
Dmitry Stogov
2020-11-11 14:55:08 +03:00
parent 01de00073f de359c00b4
commit aa84e2c364
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1751,6 +1751,9 @@ propagate_arg:
}
}
}
if (opline->op1_type == IS_CV && (info & MAY_BE_RC1)) {
info |= MAY_BE_RCN;
}
if (info & MAY_BE_UNDEF) {
info |= MAY_BE_NULL;
info &= ~MAY_BE_UNDEF;

2
ext/opcache/jit/zend_jit_vm_helpers.c
View File

@@ -406,7 +406,7 @@ static int zend_jit_trace_recursive_ret_count(const zend_op_array *op_array, con
static int zend_jit_trace_has_recursive_ret(zend_execute_data *ex, const zend_op_array *orig_op_array, const zend_op *orig_opline, int ret_level)
{
while (ex != NULL && ret_level < ZEND_JIT_TRACE_MAX_RET_DEPTH) {
while (ex != NULL && ex->func != NULL && ret_level < ZEND_JIT_TRACE_MAX_RET_DEPTH) {
if (&ex->func->op_array == orig_op_array && ex->opline + 1 == orig_opline) {
return 1;
}