archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Avoid refcounted copy in _object_properties_init() for internal classes (#12474)

Browse source 
This currently uses ZVAL_COPY_OR_DUP, which copies the value and handles
refcounting. However, internal classes cannot have refcounted default
properties because of constraints imposed by
zend_declare_typed_property(). So copying the value is sufficient.

While this doesn't really improve the performance for our benchmarks, it
improves performance for cases where a lot of temporary internal objects
are instantiated. For example, when instantiating DOM classes: DOM
objects are transient, so lots of temporary objects are created.
This commit is contained in:
Niels Dossche 2023-10-19 11:34:55 +01:00 • committed by GitHub
parent 7d551a89e5
commit cdfa016854
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Zend/zend_API.c
View file

@ -1610,8 +1610,11 @@ static zend_always_inline void _object_properties_init(zend_object *object, zend
zval *end = src + class_type->default_properties_count; zval *end = src + class_type->default_properties_count;
if (UNEXPECTED(class_type->type == ZEND_INTERNAL_CLASS)) { if (UNEXPECTED(class_type->type == ZEND_INTERNAL_CLASS)) {
/* We don't have to account for refcounting because
* zend_declare_typed_property() disallows refcounted defaults for internal classes. */
do { do {
ZVAL_COPY_OR_DUP_PROP(dst, src); ZEND_ASSERT(!Z_REFCOUNTED_P(src));
ZVAL_COPY_VALUE_PROP(dst, src);
src++; src++;
dst++; dst++;
} while (src != end); } while (src != end);

5
Zend/zend_inheritance.c
View file

@ -1547,7 +1547,10 @@ ZEND_API void zend_do_inheritance_ex(zend_class_entry *ce, zend_class_entry *par
do { do {
dst--; dst--;
src--; src--;
ZVAL_COPY_OR_DUP_PROP(dst, src); /* We don't have to account for refcounting because
* zend_declare_typed_property() disallows refcounted defaults for internal classes. */
ZEND_ASSERT(!Z_REFCOUNTED_P(src));
ZVAL_COPY_VALUE_PROP(dst, src);
if (Z_OPT_TYPE_P(dst) == IS_CONSTANT_AST) { if (Z_OPT_TYPE_P(dst) == IS_CONSTANT_AST) {
ce->ce_flags &= ~ZEND_ACC_CONSTANTS_UPDATED; ce->ce_flags &= ~ZEND_ACC_CONSTANTS_UPDATED;
ce->ce_flags |= ZEND_ACC_HAS_AST_PROPERTIES; ce->ce_flags |= ZEND_ACC_HAS_AST_PROPERTIES;