mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
Don't initialize static_member_tables during start-up, when inherit internal classes.
This commit is contained in:
parent
1257664ca2
commit
03384cae3c
@ -885,12 +885,11 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent
|
|||||||
dst = end + parent_ce->default_static_members_count;
|
dst = end + parent_ce->default_static_members_count;
|
||||||
ce->default_static_members_table = end;
|
ce->default_static_members_table = end;
|
||||||
}
|
}
|
||||||
if (CE_STATIC_MEMBERS(parent_ce) == NULL) {
|
|
||||||
ZEND_ASSERT(parent_ce->type == ZEND_INTERNAL_CLASS || (parent_ce->ce_flags & ZEND_ACC_IMMUTABLE));
|
|
||||||
zend_class_init_statics(parent_ce);
|
|
||||||
}
|
|
||||||
if (UNEXPECTED(parent_ce->type != ce->type)) {
|
if (UNEXPECTED(parent_ce->type != ce->type)) {
|
||||||
/* User class extends internal */
|
/* User class extends internal */
|
||||||
|
if (CE_STATIC_MEMBERS(parent_ce) == NULL) {
|
||||||
|
zend_class_init_statics(parent_ce);
|
||||||
|
}
|
||||||
if (UNEXPECTED(zend_update_class_constants(parent_ce) != SUCCESS)) {
|
if (UNEXPECTED(zend_update_class_constants(parent_ce) != SUCCESS)) {
|
||||||
ZEND_ASSERT(0);
|
ZEND_ASSERT(0);
|
||||||
}
|
}
|
||||||
@ -905,6 +904,10 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent
|
|||||||
}
|
}
|
||||||
} while (dst != end);
|
} while (dst != end);
|
||||||
} else if (ce->type == ZEND_USER_CLASS) {
|
} else if (ce->type == ZEND_USER_CLASS) {
|
||||||
|
if (CE_STATIC_MEMBERS(parent_ce) == NULL) {
|
||||||
|
ZEND_ASSERT(parent_ce->ce_flags & ZEND_ACC_IMMUTABLE);
|
||||||
|
zend_class_init_statics(parent_ce);
|
||||||
|
}
|
||||||
src = CE_STATIC_MEMBERS(parent_ce) + parent_ce->default_static_members_count;
|
src = CE_STATIC_MEMBERS(parent_ce) + parent_ce->default_static_members_count;
|
||||||
do {
|
do {
|
||||||
dst--;
|
dst--;
|
||||||
|
Loading…
Reference in New Issue
Block a user