diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-03-23 17:12:55 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-03-23 17:12:55 +0100 |
| commit | dcbdcf87c83f996cb864acdb8dd7ff96ddd6465d (patch) | |
| tree | cdd14752eb5c2beebb9e4d233b520082be50b0b1 /ext/opcache/Optimizer/zend_inference.c | |
| parent | 3b26a3868e06b67936a3c385d46b07879ba9eb43 (diff) | |
| parent | dd9b5c86809b573c5bad257d7f3b4fae51373f57 (diff) | |
| download | php-git-dcbdcf87c83f996cb864acdb8dd7ff96ddd6465d.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Handle NULL caller_call_opline
Diffstat (limited to 'ext/opcache/Optimizer/zend_inference.c')
| -rw-r--r-- | ext/opcache/Optimizer/zend_inference.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c index cb02e58673..0c22f9b384 100644 --- a/ext/opcache/Optimizer/zend_inference.c +++ b/ext/opcache/Optimizer/zend_inference.c @@ -4207,7 +4207,7 @@ void zend_inference_check_recursive_dependencies(zend_op_array *op_array) memset(worklist, 0, sizeof(zend_ulong) * worklist_len); call_info = info->callee_info; while (call_info) { - if (call_info->recursive && + if (call_info->recursive && call_info->caller_call_opline && info->ssa.ops[call_info->caller_call_opline - op_array->opcodes].result_def >= 0) { zend_bitset_incl(worklist, info->ssa.ops[call_info->caller_call_opline - op_array->opcodes].result_def); } |