Preload unlinked classes, remove preload autoload #7311
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@dstogov What do you think about this? |
nikic
force-pushed
the
preload-no-autoload
branch
from
7c89f95 to
a274234
Compare
dstogov
approved these changes
Jul 28, 2021
| success = zend_hash_set_bucket_key(EG(class_table), (Bucket*) class_table_slot, Z_STR_P(lcname)) != NULL; | ||
| } else { | ||
| /* If preloading is used, don't replace the existing bucket, add a new one. */ | ||
| success = zend_hash_add_ptr(EG(class_table), Z_STR_P(lcname), ce) != NULL; |
There was a problem hiding this comment.
If the original bucket (< persistent_classes_count) is replaced, it won't get cleaned up on shutdown, and we'll leak a class from the previous request into the next one.
Zend/zend_inheritance.c
Outdated
| @@ -3021,18 +3021,24 @@ zend_class_entry *zend_try_early_bind(zend_class_entry *ce, zend_class_entry *pa | |||
| zend_class_entry *proto = NULL; | |||
| zend_class_entry *orig_linking_class; | |||
| uint32_t is_cacheable = ce->ce_flags & ZEND_ACC_IMMUTABLE; | |||
| bool is_preloaded = ce->ce_flags & ZEND_ACC_PRELOADED; | |||
There was a problem hiding this comment.
I think, it may be more efficient to check the flag each time. Checking it once, but than checking another local variable doesn't make a lot of sense.
nikic
added a commit
that referenced
this pull request
Jul 28, 2021
This is the same for the cached and uncached cases and will make GH-7311 a bit simpler.
nikic
force-pushed
the
preload-no-autoload
branch
from
a274234 to
8b85a9c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, classes that can't be linked get moved back into the original script and are not preloaded. As such classes may be references from functions that did get preloaded, there is a preload autoload mechanism to load them at runtime.
Since PHP 8.1, we can safely preload unlinked classes, which will then go through usual lazy loading. This means that we no longer need the preload autoload mechanism. However, we need to be careful not to modify any hash table buckets in-place, and should create new buckets for lazy loaded classes.