[php-src] master: Zend: use type uint32_t for default_static_members_count CE field
Author: Gina Peter Banyard (Girgias)
Date: 2025-10-21T22:42:00+01:00
Commit: https://github.com/php/php-src/commit/40a42cffd81b7f01fed25b3f7d02cb4d2ead700d
Raw diff: https://github.com/php/php-src/commit/40a42cffd81b7f01fed25b3f7d02cb4d2ead700d.diff
Zend: use type uint32_t for default_static_members_count CE field
Changed paths:
M Zend/zend.h
M Zend/zend_object_handlers.c
M ext/opcache/zend_persist.c
M ext/opcache/zend_persist_calc.c
Diff:
diff --git a/Zend/zend.h b/Zend/zend.h
index 2155be43c12b..aff48ca0e206 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -157,7 +157,7 @@ struct _zend_class_entry {
uint32_t ce_flags2;
int default_properties_count;
- int default_static_members_count;
+ uint32_t default_static_members_count;
zval *default_properties_table;
zval *default_static_members_table;
ZEND_MAP_PTR_DEF(zval *, static_members_table);
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 17676e8edea4..7514a1ddef82 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -2006,7 +2006,6 @@ ZEND_API zend_function *zend_std_get_static_method(zend_class_entry *ce,
zend_st
ZEND_API void zend_class_init_statics(zend_class_entry *class_type) /* {{{ */
{
- int i;
zval *p;
if (class_type->default_static_members_count && !CE_STATIC_MEMBERS(class_type)) {
@@ -2015,7 +2014,7 @@ ZEND_API void zend_class_init_statics(zend_class_entry *class_type) /* {{{ */
}
ZEND_MAP_PTR_SET(class_type->static_members_table, emalloc(sizeof(zval) *
class_type->default_static_members_count));
- for (i = 0; i < class_type->default_static_members_count; i++) {
+ for (uint32_t i = 0; i < class_type->default_static_members_count; i++) {
p = &class_type->default_static_members_table[i];
if (Z_TYPE_P(p) == IS_INDIRECT) {
zval *q = &CE_STATIC_MEMBERS(class_type->parent)[i];
diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c
index e1187b045b13..ef69cceb0250 100644
--- a/ext/opcache/zend_persist.c
+++ b/ext/opcache/zend_persist.c
@@ -967,12 +967,11 @@ zend_class_entry *zend_persist_class_entry(zend_class_entry *orig_ce)
}
}
if (ce->default_static_members_table) {
- int i;
ce->default_static_members_table =
zend_shared_memdup_free(ce->default_static_members_table, sizeof(zval) *
ce->default_static_members_count);
/* Persist only static properties in this class.
* Static properties from parent classes will be handled in class_copy_ctor and are marked with
IS_INDIRECT */
- for (i = 0; i < ce->default_static_members_count; i++) {
+ for (uint32_t i = 0; i < ce->default_static_members_count; i++) {
if (Z_TYPE(ce->default_static_members_table[i]) != IS_INDIRECT) {
zend_persist_zval(&ce->default_static_members_table[i]);
}
diff --git a/ext/opcache/zend_persist_calc.c b/ext/opcache/zend_persist_calc.c
index 3c763d239e5f..c638d66619d0 100644
--- a/ext/opcache/zend_persist_calc.c
+++ b/ext/opcache/zend_persist_calc.c
@@ -479,10 +479,8 @@ void zend_persist_class_entry_calc(zend_class_entry *ce)
}
}
if (ce->default_static_members_table) {
- int i;
-
ADD_SIZE(sizeof(zval) * ce->default_static_members_count);
- for (i = 0; i < ce->default_static_members_count; i++) {
+ for (uint32_t i = 0; i < ce->default_static_members_count; i++) {
if (Z_TYPE(ce->default_static_members_table[i]) != IS_INDIRECT) {
zend_persist_zval_calc(&ce->default_static_members_table[i]);
}
Thread (1 message)
- Gina Peter Banyard