diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-05 13:16:31 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-05 13:16:31 +0100 |
| commit | 046143859d75ba82724b448ff81daf3abf623360 (patch) | |
| tree | e87b85c81e5bce9d2a03403c6c1a4239d87300ea /ext/opcache/ZendAccelerator.c | |
| parent | 1fea175765c8304a96accb0fda8d6e6edc43a61e (diff) | |
| parent | 2effbfd8713936742ef46e6e85ce193b320ac005 (diff) | |
| download | php-git-046143859d75ba82724b448ff81daf3abf623360.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixup trait methods even if no traits are used
Diffstat (limited to 'ext/opcache/ZendAccelerator.c')
| -rw-r--r-- | ext/opcache/ZendAccelerator.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 91b06f099e..c8ee9b9da6 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -4190,16 +4190,12 @@ static int preload_optimize(zend_persistent_script *script) } ZEND_HASH_FOREACH_PTR(&script->script.class_table, ce) { - if (ce->num_traits) { - preload_fix_trait_methods(ce); - } + preload_fix_trait_methods(ce); } ZEND_HASH_FOREACH_END(); ZEND_HASH_FOREACH_PTR(preload_scripts, script) { ZEND_HASH_FOREACH_PTR(&script->script.class_table, ce) { - if (ce->num_traits) { - preload_fix_trait_methods(ce); - } + preload_fix_trait_methods(ce); } ZEND_HASH_FOREACH_END(); } ZEND_HASH_FOREACH_END(); |