diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-24 09:33:58 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-24 09:33:58 +0200 |
| commit | e06ec226bc661acbf4d705e5bf02a11690b31baa (patch) | |
| tree | 605cd08efccf83e32cb1f8c8c864e0758d4489c7 /Zend/zend_operators.c | |
| parent | 378aeb86854a0e244b2f1528694b595660b7d533 (diff) | |
| parent | 49a3b03e9fa3b6a7ef5302a48203b03e9d870ce9 (diff) | |
| download | php-git-e06ec226bc661acbf4d705e5bf02a11690b31baa.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 361223a7c0..fd784b7534 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -2260,7 +2260,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_ASSERT(instance_ce->ce_flags & (ZEND_ACC_LINKED|ZEND_ACC_LINKING_IN_PROGRESS)); for (i = 0; i < instance_ce->num_interfaces; i++) { if (instanceof_interface_only(instance_ce->interfaces[i], ce)) { return 1; @@ -2288,7 +2288,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_ASSERT(instance_ce->ce_flags & (ZEND_ACC_LINKED|ZEND_ACC_LINKING_IN_PROGRESS)); for (i = 0; i < instance_ce->num_interfaces; i++) { if (instanceof_interface(instance_ce->interfaces[i], ce)) { return 1; |