8000 Immutable clases and op_arrays by dstogov · Pull Request #3608 · php/php-src · GitHub
[go: up one dir, main page]
Skip to content

Immutable clases and op_arrays #3608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 11 commits into from
Closed

Immutable clases and op_arrays #3608

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9409958
Immutable clases and op_arrays
dstogov Oct 15, 2018
a06f0f3
Merge branch 'master' into immutable
dstogov Oct 17, 2018
9ef07c8
typo
dstogov Oct 17, 2018
8dadca8
Hide offset encoding magic in ZEND_MAP_PTR_IS_OFFSET(), ZEND_MAP_PTR_…
dstogov Oct 17, 2018
d5a4108
Removed duplicate code
dstogov Oct 17, 2018
b945548
Removed redundand assertion
dstogov Oct 17, 2018
c63fc5d
Moved static class members initialization into the proper place.
dstogov Oct 17, 2018
0276ea5
Added type cast
dstogov Oct 17, 2018
ad7a78b
Added comment
dstogov Oct 17, 2018
4740dab
Reverted back ce->iterator_funcs_ptr. Initialize ce->iterator_funcs_p…
dstogov Oct 17, 2018
cd0c36c
Merge branch 'master' into immutable
dstogov Oct 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Moved static class members initialization into the proper place.
  • Loading branch information
@dstogov
dstogov committed Oct 17, 2018
commit c63fc5d5f19c58498108d1698055b2b442227eb3
8 changes: 4 additions & 4 deletions Zend/zend_inheritance.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,6 +885,10 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent
dst = end + parent_ce->default_static_members_count;
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)) {
/* User class extends internal */
if (UNEXPECTED(zend_update_class_constants(parent_ce) != SUCCESS)) {
Expand All @@ -901,10 +905,6 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent
}
} while (dst != end);
} else if (ce->type == ZEND_USER_CLASS) {
if (UNEXPECTED(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);
}
src = CE_STATIC_MEMBERS(parent_ce) + parent_ce->default_static_members_count;
do {
dst--;
Expand Down
0