php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

zend_object_handlers: add some const qualifiers (#20402)

Browse Source
This commit is contained in:
Gina Peter Banyard
2025-11-06 22:47:39 +00:00
committed by GitHub
parent 0953e898db
commit 297179dbcc
3 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Zend/zend_API.c
View File

@@ -1687,10 +1687,9 @@ ZEND_API void object_properties_init_ex(zend_object *object, HashTable *properti
if (object->ce->default_properties_count) { if (object->ce->default_properties_count) {
zval *prop; zval *prop;
zend_string *key; zend_string *key;
zend_property_info *property_info;
ZEND_HASH_MAP_FOREACH_STR_KEY_VAL(properties, key, prop) { ZEND_HASH_MAP_FOREACH_STR_KEY_VAL(properties, key, prop) {
property_info = zend_get_property_info(object->ce, key, 1); const zend_property_info *property_info = zend_get_property_info(object->ce, key, 1);
if (property_info != ZEND_WRONG_PROPERTY_INFO && if (property_info != ZEND_WRONG_PROPERTY_INFO &&
property_info && property_info &&
(property_info->flags & ZEND_ACC_STATIC) == 0) { (property_info->flags & ZEND_ACC_STATIC) == 0) {
@@ -1719,7 +1718,7 @@ ZEND_API void object_properties_load(zend_object *object, HashTable *properties)
zval *prop, tmp; zval *prop, tmp;
zend_string *key; zend_string *key;
zend_long h; zend_long h;
zend_property_info *property_info; const zend_property_info *property_info;
ZEND_HASH_FOREACH_KEY_VAL(properties, h, key, prop) { ZEND_HASH_FOREACH_KEY_VAL(properties, h, key, prop) {
if (key) { if (key) {

44
Zend/zend_object_handlers.c
View File

@@ -106,8 +106,7 @@ ZEND_API HashTable *rebuild_object_properties_internal(zend_object *zobj) /* {{{
/* Implements the fast path for array cast */ /* Implements the fast path for array cast */
ZEND_API HashTable *zend_std_build_object_properties_array(zend_object *zobj) /* {{{ */ ZEND_API HashTable *zend_std_build_object_properties_array(zend_object *zobj) /* {{{ */
{ {
zend_property_info *prop_info; const zend_class_entry *ce = zobj->ce;
zend_class_entry *ce = zobj->ce;
HashTable *ht; HashTable *ht;
zval* prop; zval* prop;
int i; int i;
@@ -118,7 +117,7 @@ ZEND_API HashTable *zend_std_build_object_properties_array(zend_object *zobj) /*
if (ce->default_properties_count) { if (ce->default_properties_count) {
zend_hash_real_init_mixed(ht); zend_hash_real_init_mixed(ht);
for (i = 0; i < ce->default_properties_count; i++) { for (i = 0; i < ce->default_properties_count; i++) {
prop_info = ce->properties_info_table[i]; const zend_property_info *prop_info = ce->properties_info_table[i];
if (!prop_info) { if (!prop_info) {
continue; continue;
@@ -192,7 +191,7 @@ ZEND_API HashTable *zend_std_get_gc(zend_object *zobj, zval **table, int *n) /*
ZEND_API HashTable *zend_std_get_debug_info(zend_object *object, int *is_temp) /* {{{ */ ZEND_API HashTable *zend_std_get_debug_info(zend_object *object, int *is_temp) /* {{{ */
{ {
zend_class_entry *ce = object->ce; const zend_class_entry *ce = object->ce;
zval retval; zval retval;
HashTable *ht; HashTable *ht;
@@ -334,7 +333,7 @@ static ZEND_COLD zend_never_inline bool zend_deprecated_dynamic_property(
zend_error(E_DEPRECATED, "Creation of dynamic property %s::$%s is deprecated", zend_error(E_DEPRECATED, "Creation of dynamic property %s::$%s is deprecated",
ZSTR_VAL(obj->ce->name), ZSTR_VAL(member)); ZSTR_VAL(obj->ce->name), ZSTR_VAL(member));
if (UNEXPECTED(GC_DELREF(obj) == 0)) { if (UNEXPECTED(GC_DELREF(obj) == 0)) {
zend_class_entry *ce = obj->ce; const zend_class_entry *ce = obj->ce;
zend_objects_store_del(obj); zend_objects_store_del(obj);
if (!EG(exception)) { if (!EG(exception)) {
/* We cannot continue execution and have to throw an exception */ /* We cannot continue execution and have to throw an exception */
@@ -347,7 +346,7 @@ static ZEND_COLD zend_never_inline bool zend_deprecated_dynamic_property(
} }
static ZEND_COLD zend_never_inline void zend_readonly_property_unset_error( static ZEND_COLD zend_never_inline void zend_readonly_property_unset_error(
zend_class_entry *ce, zend_string *member) { const zend_class_entry *ce, const zend_string *member) {
zend_throw_error(NULL, "Cannot unset readonly property %s::$%s", zend_throw_error(NULL, "Cannot unset readonly property %s::$%s",
ZSTR_VAL(ce->name), ZSTR_VAL(member)); ZSTR_VAL(ce->name), ZSTR_VAL(member));
} }
@@ -711,7 +710,7 @@ static bool zend_should_call_hook(const zend_property_info *prop_info, const zen
return true; return true;
} }
static ZEND_COLD void zend_throw_no_prop_backing_value_access(zend_string *class_name, zend_string *prop_name, bool is_read) static ZEND_COLD void zend_throw_no_prop_backing_value_access(const zend_string *class_name, const zend_string *prop_name, bool is_read)
{ {
zend_throw_error(NULL, "Must not %s virtual property %s::$%s", zend_throw_error(NULL, "Must not %s virtual property %s::$%s",
is_read ? "read from" : "write to", is_read ? "read from" : "write to",
@@ -719,7 +718,7 @@ static ZEND_COLD void zend_throw_no_prop_backing_value_access(zend_string *class
} }
static bool zend_call_get_hook( static bool zend_call_get_hook(
const zend_property_info *prop_info, zend_string *prop_name, const zend_property_info *prop_info, const zend_string *prop_name,
zend_function *get, zend_object *zobj, zval *rv) zend_function *get, zend_object *zobj, zval *rv)
{ {
if (!zend_should_call_hook(prop_info, zobj)) { if (!zend_should_call_hook(prop_info, zobj)) {
@@ -842,7 +841,7 @@ try_again:
goto exit; goto exit;
} }
zend_class_entry *ce = zobj->ce; const zend_class_entry *ce = zobj->ce;
if (!zend_call_get_hook(prop_info, name, get, zobj, rv)) { if (!zend_call_get_hook(prop_info, name, get, zobj, rv)) {
if (EG(exception)) { if (EG(exception)) {
@@ -850,7 +849,7 @@ try_again:
} }
/* Reads from backing store can only occur in hooks, and hence will always remain simple. */ /* Reads from backing store can only occur in hooks, and hence will always remain simple. */
zend_execute_data *execute_data = EG(current_execute_data); const zend_execute_data *execute_data = EG(current_execute_data);
if (cache_slot && EX(opline) && EX(opline)->opcode == ZEND_FETCH_OBJ_R && EX(opline)->op1_type == IS_UNUSED) { if (cache_slot && EX(opline) && EX(opline)->opcode == ZEND_FETCH_OBJ_R && EX(opline)->op1_type == IS_UNUSED) {
ZEND_SET_PROPERTY_HOOK_SIMPLE_READ(cache_slot); ZEND_SET_PROPERTY_HOOK_SIMPLE_READ(cache_slot);
} }
@@ -1274,7 +1273,7 @@ lazy_init:
} }
/* }}} */ /* }}} */
static ZEND_COLD zend_never_inline void zend_bad_array_access(zend_class_entry *ce) /* {{{ */ static ZEND_COLD zend_never_inline void zend_bad_array_access(const zend_class_entry *ce) /* {{{ */
{ {
zend_throw_error(NULL, "Cannot use object of type %s as array", ZSTR_VAL(ce->name)); zend_throw_error(NULL, "Cannot use object of type %s as array", ZSTR_VAL(ce->name));
} }
@@ -1282,7 +1281,7 @@ static ZEND_COLD zend_never_inline void zend_bad_array_access(zend_class_entry *
ZEND_API zval *zend_std_read_dimension(zend_object *object, zval *offset, int type, zval *rv) /* {{{ */ ZEND_API zval *zend_std_read_dimension(zend_object *object, zval *offset, int type, zval *rv) /* {{{ */
{ {
zend_class_entry *ce = object->ce; const zend_class_entry *ce = object->ce;
zval tmp_offset; zval tmp_offset;
/* arrayaccess_funcs_ptr is set if (and only if) the class implements zend_ce_arrayaccess */ /* arrayaccess_funcs_ptr is set if (and only if) the class implements zend_ce_arrayaccess */
@@ -1333,7 +1332,7 @@ ZEND_API zval *zend_std_read_dimension(zend_object *object, zval *offset, int ty
ZEND_API void zend_std_write_dimension(zend_object *object, zval *offset, zval *value) /* {{{ */ ZEND_API void zend_std_write_dimension(zend_object *object, zval *offset, zval *value) /* {{{ */
{ {
zend_class_entry *ce = object->ce; const zend_class_entry *ce = object->ce;
zval tmp_offset; zval tmp_offset;
zend_class_arrayaccess_funcs *funcs = ce->arrayaccess_funcs_ptr; zend_class_arrayaccess_funcs *funcs = ce->arrayaccess_funcs_ptr;
@@ -1356,7 +1355,7 @@ ZEND_API void zend_std_write_dimension(zend_object *object, zval *offset, zval *
// todo: make zend_std_has_dimension return bool as well // todo: make zend_std_has_dimension return bool as well
ZEND_API int zend_std_has_dimension(zend_object *object, zval *offset, int check_empty) /* {{{ */ ZEND_API int zend_std_has_dimension(zend_object *object, zval *offset, int check_empty) /* {{{ */
{ {
zend_class_entry *ce = object->ce; const zend_class_entry *ce = object->ce;
zval retval, tmp_offset; zval retval, tmp_offset;
bool result; bool result;
@@ -1610,7 +1609,7 @@ ZEND_API void zend_std_unset_property(zend_object *zobj, zend_string *name, void
ZEND_API void zend_std_unset_dimension(zend_object *object, zval *offset) /* {{{ */ ZEND_API void zend_std_unset_dimension(zend_object *object, zval *offset) /* {{{ */
{ {
zend_class_entry *ce = object->ce; const zend_class_entry *ce = object->ce;
zval tmp_offset; zval tmp_offset;
zend_class_arrayaccess_funcs *funcs = ce->arrayaccess_funcs_ptr; zend_class_arrayaccess_funcs *funcs = ce->arrayaccess_funcs_ptr;
@@ -1626,7 +1625,7 @@ ZEND_API void zend_std_unset_dimension(zend_object *object, zval *offset) /* {{{
} }
/* }}} */ /* }}} */
static zend_never_inline zend_function *zend_get_parent_private_method(zend_class_entry *scope, zend_class_entry *ce, zend_string *function_name) /* {{{ */ static zend_never_inline zend_function *zend_get_parent_private_method(const zend_class_entry *scope, const zend_class_entry *ce, zend_string *function_name) /* {{{ */
{ {
zval *func; zval *func;
zend_function *fbc; zend_function *fbc;
@@ -1747,7 +1746,7 @@ static ZEND_FUNCTION(zend_parent_hook_get_trampoline)
} }
zval rv; zval rv;
zval *retval = obj->handlers->read_property(obj, prop_name, BP_VAR_R, NULL, &rv); const zval *retval = obj->handlers->read_property(obj, prop_name, BP_VAR_R, NULL, &rv);
if (retval == &rv) { if (retval == &rv) {
RETVAL_COPY_VALUE(retval); RETVAL_COPY_VALUE(retval);
} else { } else {
@@ -1846,7 +1845,6 @@ ZEND_API zend_function *zend_std_get_method(zend_object **obj_ptr, zend_string *
zval *func; zval *func;
zend_function *fbc; zend_function *fbc;
zend_string *lc_method_name; zend_string *lc_method_name;
zend_class_entry *scope;
ALLOCA_FLAG(use_heap); ALLOCA_FLAG(use_heap);
if (EXPECTED(key != NULL)) { if (EXPECTED(key != NULL)) {
@@ -1874,7 +1872,7 @@ ZEND_API zend_function *zend_std_get_method(zend_object **obj_ptr, zend_string *
/* Check access level */ /* Check access level */
if (fbc->op_array.fn_flags & (ZEND_ACC_CHANGED|ZEND_ACC_PRIVATE|ZEND_ACC_PROTECTED)) { if (fbc->op_array.fn_flags & (ZEND_ACC_CHANGED|ZEND_ACC_PRIVATE|ZEND_ACC_PROTECTED)) {
scope = zend_get_executed_scope(); const zend_class_entry *scope = zend_get_executed_scope();
if (fbc->common.scope != scope) { if (fbc->common.scope != scope) {
if (fbc->op_array.fn_flags & ZEND_ACC_CHANGED) { if (fbc->op_array.fn_flags & ZEND_ACC_CHANGED) {
@@ -1930,7 +1928,7 @@ static zend_always_inline zend_function *get_static_method_fallback(
} }
} }
ZEND_API zend_function *zend_std_get_static_method(zend_class_entry *ce, zend_string *function_name, const zval *key) /* {{{ */ ZEND_API zend_function *zend_std_get_static_method(const zend_class_entry *ce, zend_string *function_name, const zval *key) /* {{{ */
{ {
zend_string *lc_function_name; zend_string *lc_function_name;
if (EXPECTED(key != NULL)) { if (EXPECTED(key != NULL)) {
@@ -1944,7 +1942,7 @@ ZEND_API zend_function *zend_std_get_static_method(zend_class_entry *ce, zend_st
if (EXPECTED(func)) { if (EXPECTED(func)) {
fbc = Z_FUNC_P(func); fbc = Z_FUNC_P(func);
if (!(fbc->common.fn_flags & ZEND_ACC_PUBLIC)) { if (!(fbc->common.fn_flags & ZEND_ACC_PUBLIC)) {
zend_class_entry *scope = zend_get_executed_scope(); const zend_class_entry *scope = zend_get_executed_scope();
ZEND_ASSERT(!(fbc->common.fn_flags & ZEND_ACC_PUBLIC)); ZEND_ASSERT(!(fbc->common.fn_flags & ZEND_ACC_PUBLIC));
if (!zend_check_method_accessible(fbc, scope)) { if (!zend_check_method_accessible(fbc, scope)) {
zend_function *fallback_fbc = get_static_method_fallback(ce, function_name); zend_function *fallback_fbc = get_static_method_fallback(ce, function_name);
@@ -2442,7 +2440,7 @@ ZEND_API zend_result zend_std_cast_object_tostring(zend_object *readobj, zval *w
{ {
switch (type) { switch (type) {
case IS_STRING: { case IS_STRING: {
zend_class_entry *ce = readobj->ce; const zend_class_entry *ce = readobj->ce;
if (ce->__tostring) { if (ce->__tostring) {
zval retval; zval retval;
GC_ADDREF(readobj); GC_ADDREF(readobj);
@@ -2475,7 +2473,7 @@ is_string:
ZEND_API zend_result zend_std_get_closure(zend_object *obj, zend_class_entry **ce_ptr, zend_function **fptr_ptr, zend_object **obj_ptr, bool check_only) /* {{{ */ ZEND_API zend_result zend_std_get_closure(zend_object *obj, zend_class_entry **ce_ptr, zend_function **fptr_ptr, zend_object **obj_ptr, bool check_only) /* {{{ */
{ {
zend_class_entry *ce = obj->ce; zend_class_entry *ce = obj->ce;
zval *func = zend_hash_find_known_hash(&ce->function_table, ZSTR_KNOWN(ZEND_STR_MAGIC_INVOKE)); const zval *func = zend_hash_find_known_hash(&ce->function_table, ZSTR_KNOWN(ZEND_STR_MAGIC_INVOKE));
if (func == NULL) { if (func == NULL) {
return FAILURE; return FAILURE;

2
Zend/zend_object_handlers.h
View File

@@ -248,7 +248,7 @@ extern const ZEND_API zend_object_handlers std_object_handlers;
#define ZEND_PROPERTY_EXISTS 0x2 /* Property exists */ #define ZEND_PROPERTY_EXISTS 0x2 /* Property exists */
ZEND_API void zend_class_init_statics(zend_class_entry *ce); ZEND_API void zend_class_init_statics(zend_class_entry *ce);
ZEND_API zend_function *zend_std_get_static_method(zend_class_entry *ce, zend_string *function_name_strval, const zval *key); ZEND_API zend_function *zend_std_get_static_method(const zend_class_entry *ce, zend_string *function_name_strval, const zval *key);
ZEND_API zval *zend_std_get_static_property_with_info(zend_class_entry *ce, zend_string *property_name, int type, struct _zend_property_info **prop_info); ZEND_API zval *zend_std_get_static_property_with_info(zend_class_entry *ce, zend_string *property_name, int type, struct _zend_property_info **prop_info);
ZEND_API zval *zend_std_get_static_property(zend_class_entry *ce, zend_string *property_name, int type); ZEND_API zval *zend_std_get_static_property(zend_class_entry *ce, zend_string *property_name, int type);
ZEND_API ZEND_COLD bool zend_std_unset_static_property(const zend_class_entry *ce, const zend_string *property_name); ZEND_API ZEND_COLD bool zend_std_unset_static_property(const zend_class_entry *ce, const zend_string *property_name);