diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-11 13:15:03 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-11 13:16:38 +0200 |
| commit | e4fae9c0615cd92783c226de8abcea31ed732672 (patch) | |
| tree | fe947525c7c6c87661782f14e6592cf7fab74ea7 /Zend/zend_operators.c | |
| parent | 8f93beb06e8450126e6f78c3b650b68f390a4deb (diff) | |
| parent | 8f8fcbbd397370b407dc2552c4bd6ee4ccb0e93b (diff) | |
| download | php-git-e4fae9c0615cd92783c226de8abcea31ed732672.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index dc04548757..575a68d0d5 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -2265,7 +2265,7 @@ static zend_bool ZEND_FASTCALL instanceof_interface_only(const zend_class_entry uint32_t i; if (instance_ce->num_interfaces) { - ZEND_ASSERT(instance_ce->ce_flags & (ZEND_ACC_LINKED|ZEND_ACC_LINKING_IN_PROGRESS)); + ZEND_ASSERT(instance_ce->ce_flags & ZEND_ACC_RESOLVED_INTERFACES); for (i = 0; i < instance_ce->num_interfaces; i++) { if (instanceof_interface_only(instance_ce->interfaces[i], ce)) { return 1; @@ -2293,7 +2293,7 @@ static zend_bool ZEND_FASTCALL instanceof_interface(const zend_class_entry *inst uint32_t i; if (instance_ce->num_interfaces) { - ZEND_ASSERT(instance_ce->ce_flags & (ZEND_ACC_LINKED|ZEND_ACC_LINKING_IN_PROGRESS)); + ZEND_ASSERT(instance_ce->ce_flags & ZEND_ACC_RESOLVED_INTERFACES); for (i = 0; i < instance_ce->num_interfaces; i++) { if (instanceof_interface(instance_ce->interfaces[i], ce)) { return 1; |