diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-02-06 10:42:25 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-02-06 10:42:25 +0100 |
| commit | 4f5f72c7afa18a036bcd2e510141853e9ef143fe (patch) | |
| tree | 97e18f0fbaea5efc2f1ce8105ae0d308dc6b49f3 /ext/opcache/Optimizer/zend_inference.c | |
| parent | ac89139773a456f70f460fcc5fefb90c6326b257 (diff) | |
| download | php-git-4f5f72c7afa18a036bcd2e510141853e9ef143fe.tar.gz | |
Remove ZEND_ACC_INHERITED flag
It is equivalent to checking ce->parent != NULL. Just adds more
state that needs to be kept in sync.
Diffstat (limited to 'ext/opcache/Optimizer/zend_inference.c')
| -rw-r--r-- | ext/opcache/Optimizer/zend_inference.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c index 38124cb3d8..90273e2ffd 100644 --- a/ext/opcache/Optimizer/zend_inference.c +++ b/ext/opcache/Optimizer/zend_inference.c @@ -4538,8 +4538,7 @@ int zend_may_throw(const zend_op *opline, const zend_op_array *op_array, zend_ss zend_class_entry *ce = var_info->ce; if (var_info->is_instanceof || - !ce || ce->create_object || ce->__get || ce->__set || - (ce->ce_flags & ZEND_ACC_INHERITED)) { + !ce || ce->create_object || ce->__get || ce->__set || ce->parent) { return 1; } |