Zend/zend_execute: make several pointers const

MaxKellermann · MaxKellermann · commit e50275e203d5 · 2024-02-23T17:09:04.000+01:00
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -757,7 +757,7 @@ static bool zend_verify_weak_scalar_type_hint(uint32_t type_mask, zval *arg)
 }
 
 #if ZEND_DEBUG
-static bool can_convert_to_string(zval *zv) {
+static bool can_convert_to_string(const zval *zv) {
 	/* We don't call cast_object here, because this check must be side-effect free. As this
 	 * is only used for a sanity check of arginfo/zpp consistency, it's okay if we accept
 	 * more than actually allowed here. */
@@ -769,7 +769,7 @@ static bool can_convert_to_string(zval *zv) {
 }
 
 /* Used to sanity-check internal arginfo types without performing any actual type conversions. */
-static bool zend_verify_weak_scalar_type_hint_no_sideeffect(uint32_t type_mask, zval *arg)
+static bool zend_verify_weak_scalar_type_hint_no_sideeffect(uint32_t type_mask, const zval *arg)
 {
 	zend_long lval;
 	double dval;
@@ -814,7 +814,7 @@ ZEND_API bool zend_verify_scalar_type_hint(uint32_t type_mask, zval *arg, bool s
 	return zend_verify_weak_scalar_type_hint(type_mask, arg);
 }
 
-ZEND_COLD zend_never_inline void zend_verify_property_type_error(zend_property_info *info, zval *property)
+ZEND_COLD zend_never_inline void zend_verify_property_type_error(const zend_property_info *info, const zval *property)
 {
 	zend_string *type_str;
 
@@ -832,7 +832,7 @@ ZEND_COLD zend_never_inline void zend_verify_property_type_error(zend_property_i
 	zend_string_release(type_str);
 }
 
-ZEND_COLD void zend_match_unhandled_error(zval *value)
+ZEND_COLD void zend_match_unhandled_error(const zval *value)
 {
 	smart_str msg = {0};
 
@@ -852,18 +852,18 @@ ZEND_COLD void zend_match_unhandled_error(zval *value)
 }
 
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_readonly_property_modification_error(
-		zend_property_info *info) {
+		const zend_property_info *info) {
 	zend_throw_error(NULL, "Cannot modify readonly property %s::$%s",
 		ZSTR_VAL(info->ce->name), zend_get_unmangled_property_name(info->name));
 }
 
-ZEND_API ZEND_COLD void ZEND_FASTCALL zend_readonly_property_indirect_modification_error(zend_property_info *info)
+ZEND_API ZEND_COLD void ZEND_FASTCALL zend_readonly_property_indirect_modification_error(const zend_property_info *info)
 {
 	zend_throw_error(NULL, "Cannot indirectly modify readonly property %s::$%s",
 		ZSTR_VAL(info->ce->name), zend_get_unmangled_property_name(info->name));
 }
 
-static zend_class_entry *resolve_single_class_type(zend_string *name, zend_class_entry *self_ce) {
+static const zend_class_entry *resolve_single_class_type(zend_string *name, const zend_class_entry *self_ce) {
 	if (zend_string_equals_literal_ci(name, "self")) {
 		return self_ce;
 	} else if (zend_string_equals_literal_ci(name, "parent")) {
@@ -873,8 +873,8 @@ static zend_class_entry *resolve_single_class_type(zend_string *name, zend_class
 	}
 }
 
-static zend_always_inline zend_class_entry *zend_ce_from_type(
-		zend_property_info *info, zend_type *type) {
+static zend_always_inline const zend_class_entry *zend_ce_from_type(
+		const zend_property_info *info, const zend_type *type) {
 	ZEND_ASSERT(ZEND_TYPE_HAS_NAME(*type));
 	zend_string *name = ZEND_TYPE_NAME(*type);
 	if (ZSTR_HAS_CE_CACHE(name)) {
@@ -888,13 +888,13 @@ static zend_always_inline zend_class_entry *zend_ce_from_type(
 }
 
 static bool zend_check_intersection_for_property_class_type(zend_type_list *intersection_type_list,
-	zend_property_info *info, zend_class_entry *object_ce)
+	const zend_property_info *info, const zend_class_entry *object_ce)
 {
 	zend_type *list_type;
 
 	ZEND_TYPE_LIST_FOREACH(intersection_type_list, list_type) {
 		ZEND_ASSERT(!ZEND_TYPE_HAS_LIST(*list_type));
-		zend_class_entry *ce = zend_ce_from_type(info, list_type);
+		const zend_class_entry *ce = zend_ce_from_type(info, list_type);
 		if (!ce || !instanceof_function(object_ce, ce)) {
 			return false;
 		}
@@ -903,7 +903,7 @@ static bool zend_check_intersection_for_property_class_type(zend_type_list *inte
 }
 
 static bool zend_check_and_resolve_property_class_type(
-		zend_property_info *info, zend_class_entry *object_ce) {
+		const zend_property_info *info, const zend_class_entry *object_ce) {
 	if (ZEND_TYPE_HAS_LIST(info->type)) {
 		zend_type *list_type;
 		if (ZEND_TYPE_IS_INTERSECTION(info->type)) {
@@ -919,20 +919,20 @@ static bool zend_check_and_resolve_property_class_type(
 					continue;
 				}
 				ZEND_ASSERT(!ZEND_TYPE_HAS_LIST(*list_type));
-				zend_class_entry *ce = zend_ce_from_type(info, list_type);
+				const zend_class_entry *ce = zend_ce_from_type(info, list_type);
 				if (ce && instanceof_function(object_ce, ce)) {
 					return true;
 				}
 			} ZEND_TYPE_LIST_FOREACH_END();
 			return false;
 		}
 	} else {
-		zend_class_entry *ce = zend_ce_from_type(info, &info->type);
+		const zend_class_entry *ce = zend_ce_from_type(info, &info->type);
 		return ce && instanceof_function(object_ce, ce);
 	}
 }
 
-static zend_always_inline bool i_zend_check_property_type(zend_property_info *info, zval *property, bool strict)
+static zend_always_inline bool i_zend_check_property_type(const zend_property_info *info, zval *property, bool strict)
 {
 	ZEND_ASSERT(!Z_ISREF_P(property));
 	if (EXPECTED(ZEND_TYPE_CONTAINS_CODE(info->type, Z_TYPE_P(property)))) {
@@ -949,7 +949,7 @@ static zend_always_inline bool i_zend_check_property_type(zend_property_info *in
 	return zend_verify_scalar_type_hint(type_mask, property, strict, 0);
 }
 
-static zend_always_inline bool i_zend_verify_property_type(zend_property_info *info, zval *property, bool strict)
+static zend_always_inline bool i_zend_verify_property_type(const zend_property_info *info, zval *property, bool strict)
 {
 	if (i_zend_check_property_type(info, property, strict)) {
 		return 1;
@@ -959,7 +959,7 @@ static zend_always_inline bool i_zend_verify_property_type(zend_property_info *i
 	return 0;
 }
 
-ZEND_API bool zend_never_inline zend_verify_property_type(zend_property_info *info, zval *property, bool strict) {
+ZEND_API bool zend_never_inline zend_verify_property_type(const zend_property_info *info, zval *property, bool strict) {
 	return i_zend_verify_property_type(info, property, strict);
 }
 
@@ -3360,7 +3360,7 @@ static zend_always_inline zend_result zend_fetch_static_property_address(zval **
 	return SUCCESS;
 }
 
-ZEND_API ZEND_COLD void zend_throw_ref_type_error_type(zend_property_info *prop1, zend_property_info *prop2, zval *zv) {
+ZEND_API ZEND_COLD void zend_throw_ref_type_error_type(const zend_property_info *prop1, const zend_property_info *prop2, const zval *zv) {
 	zend_string *type1_str = zend_type_to_string(prop1->type);
 	zend_string *type2_str = zend_type_to_string(prop2->type);
 	zend_type_error("Reference with value of type %s held by property %s::$%s of type %s is not compatible with property %s::$%s of type %s",
@@ -3376,7 +3376,7 @@ ZEND_API ZEND_COLD void zend_throw_ref_type_error_type(zend_property_info *prop1
 	zend_string_release(type2_str);
 }
 
-ZEND_API ZEND_COLD void zend_throw_ref_type_error_zval(zend_property_info *prop, zval *zv) {
+ZEND_API ZEND_COLD void zend_throw_ref_type_error_zval(const zend_property_info *prop, const zval *zv) {
 	zend_string *type_str = zend_type_to_string(prop->type);
 	zend_type_error("Cannot assign %s to reference held by property %s::$%s of type %s",
 		zend_zval_type_name(zv),
@@ -3387,7 +3387,7 @@ ZEND_API ZEND_COLD void zend_throw_ref_type_error_zval(zend_property_info *prop,
 	zend_string_release(type_str);
 }
 
-ZEND_API ZEND_COLD void zend_throw_conflicting_coercion_error(zend_property_info *prop1, zend_property_info *prop2, zval *zv) {
+ZEND_API ZEND_COLD void zend_throw_conflicting_coercion_error(const zend_property_info *prop1, const zend_property_info *prop2, const zval *zv) {
 	zend_string *type1_str = zend_type_to_string(prop1->type);
 	zend_string *type2_str = zend_type_to_string(prop2->type);
 	zend_type_error("Cannot assign %s to reference held by property %s::$%s of type %s and property %s::$%s of type %s, as this would result in an inconsistent type conversion",
@@ -3405,7 +3405,7 @@ ZEND_API ZEND_COLD void zend_throw_conflicting_coercion_error(zend_property_info
 
 /* 1: valid, 0: invalid, -1: may be valid after type coercion */
 static zend_always_inline int i_zend_verify_type_assignable_zval(
-		zend_property_info *info, zval *zv, bool strict) {
+		const zend_property_info *info, const zval *zv, bool strict) {
 	zend_type type = info->type;
 	uint32_t type_mask;
 	zend_uchar zv_type = Z_TYPE_P(zv);
@@ -3447,11 +3447,11 @@ static zend_always_inline int i_zend_verify_type_assignable_zval(
 
 ZEND_API bool ZEND_FASTCALL zend_verify_ref_assignable_zval(zend_reference *ref, zval *zv, bool strict)
 {
-	zend_property_info *prop;
+	const zend_property_info *prop;
 
 	/* The value must satisfy each property type, and coerce to the same value for each property
 	 * type. Remember the first coerced type and value we've seen for this purpose. */
-	zend_property_info *first_prop = NULL;
+	const zend_property_info *first_prop = NULL;
 	zval coerced_value;
 	ZVAL_UNDEF(&coerced_value);
 
@@ -3557,7 +3557,7 @@ ZEND_API zval* zend_assign_to_typed_ref(zval *variable_ptr, zval *orig_value, ze
 	return variable_ptr;
 }
 
-ZEND_API bool ZEND_FASTCALL zend_verify_prop_assignable_by_ref(zend_property_info *prop_info, zval *orig_val, bool strict) {
+ZEND_API bool ZEND_FASTCALL zend_verify_prop_assignable_by_ref(const zend_property_info *prop_info, zval *orig_val, bool strict) {
 	zval *val = orig_val;
 	if (Z_ISREF_P(val) && ZEND_REF_HAS_TYPE_SOURCES(Z_REF_P(val))) {
 		int result;
@@ -3574,7 +3574,7 @@ ZEND_API bool ZEND_FASTCALL zend_verify_prop_assignable_by_ref(zend_property_inf
 			zval tmp;
 			ZVAL_COPY(&tmp, val);
 			if (zend_verify_weak_scalar_type_hint(ZEND_TYPE_FULL_MASK(prop_info->type), &tmp)) {
-				zend_property_info *ref_prop = ZEND_REF_FIRST_SOURCE(Z_REF_P(orig_val));
+				const zend_property_info *ref_prop = ZEND_REF_FIRST_SOURCE(Z_REF_P(orig_val));
 				zend_throw_ref_type_error_type(ref_prop, prop_info, val);
 				zval_ptr_dtor(&tmp);
 				return 0;
@@ -3615,7 +3615,7 @@ ZEND_API void ZEND_FASTCALL zend_ref_add_type_source(zend_property_info_source_l
 	source_list->list = ZEND_PROPERTY_INFO_SOURCE_FROM_LIST(list);
 }
 
-ZEND_API void ZEND_FASTCALL zend_ref_del_type_source(zend_property_info_source_list *source_list, zend_property_info *prop)
+ZEND_API void ZEND_FASTCALL zend_ref_del_type_source(zend_property_info_source_list *source_list, const zend_property_info *prop)
 {
 	zend_property_info_list *list = ZEND_PROPERTY_INFO_SOURCE_TO_LIST(source_list->list);
 	zend_property_info **ptr, **end;
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
@@ -65,16 +65,16 @@ ZEND_COLD void ZEND_FASTCALL zend_param_must_be_ref(const zend_function *func, u
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_use_resource_as_offset(const zval *dim);
 
 ZEND_API bool ZEND_FASTCALL zend_verify_ref_assignable_zval(zend_reference *ref, zval *zv, bool strict);
-ZEND_API bool ZEND_FASTCALL zend_verify_prop_assignable_by_ref(zend_property_info *prop_info, zval *orig_val, bool strict);
+ZEND_API bool ZEND_FASTCALL zend_verify_prop_assignable_by_ref(const zend_property_info *prop_info, zval *orig_val, bool strict);
 
-ZEND_API ZEND_COLD void zend_throw_ref_type_error_zval(zend_property_info *prop, zval *zv);
-ZEND_API ZEND_COLD void zend_throw_ref_type_error_type(zend_property_info *prop1, zend_property_info *prop2, zval *zv);
+ZEND_API ZEND_COLD void zend_throw_ref_type_error_zval(const zend_property_info *prop, const zval *zv);
+ZEND_API ZEND_COLD void zend_throw_ref_type_error_type(const zend_property_info *prop1, const zend_property_info *prop2, const zval *zv);
 ZEND_API ZEND_COLD zval* ZEND_FASTCALL zend_undefined_offset_write(HashTable *ht, zend_long lval);
 ZEND_API ZEND_COLD zval* ZEND_FASTCALL zend_undefined_index_write(HashTable *ht, zend_string *offset);
 ZEND_API ZEND_COLD void zend_wrong_string_offset_error(void);
 
-ZEND_API ZEND_COLD void ZEND_FASTCALL zend_readonly_property_modification_error(zend_property_info *info);
-ZEND_API ZEND_COLD void ZEND_FASTCALL zend_readonly_property_indirect_modification_error(zend_property_info *info);
+ZEND_API ZEND_COLD void ZEND_FASTCALL zend_readonly_property_modification_error(const zend_property_info *info);
+ZEND_API ZEND_COLD void ZEND_FASTCALL zend_readonly_property_indirect_modification_error(const zend_property_info *info);
 
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_cannot_add_element(void);
 
@@ -108,7 +108,7 @@ ZEND_API bool zend_verify_internal_return_type(zend_function *zf, zval *ret);
 
 
 ZEND_API void ZEND_FASTCALL zend_ref_add_type_source(zend_property_info_source_list *source_list, zend_property_info *prop);
-ZEND_API void ZEND_FASTCALL zend_ref_del_type_source(zend_property_info_source_list *source_list, zend_property_info *prop);
+ZEND_API void ZEND_FASTCALL zend_ref_del_type_source(zend_property_info_source_list *source_list, const zend_property_info *prop);
 
 ZEND_API zval* zend_assign_to_typed_ref(zval *variable_ptr, zval *value, zend_uchar value_type, bool strict);
 
@@ -452,8 +452,8 @@ ZEND_API int ZEND_FASTCALL zend_handle_undef_args(zend_execute_data *call);
 
 #define ZEND_CLASS_HAS_TYPE_HINTS(ce) ((ce->ce_flags & ZEND_ACC_HAS_TYPE_HINTS) == ZEND_ACC_HAS_TYPE_HINTS)
 
-ZEND_API bool zend_verify_property_type(zend_property_info *info, zval *property, bool strict);
-ZEND_COLD void zend_verify_property_type_error(zend_property_info *info, zval *property);
+ZEND_API bool zend_verify_property_type(const zend_property_info *info, zval *property, bool strict);
+ZEND_COLD void zend_verify_property_type_error(const zend_property_info *info, const zval *property);
 
 #define ZEND_REF_ADD_TYPE_SOURCE(ref, source) \
 	zend_ref_add_type_source(&ZEND_REF_TYPE_SOURCES(ref), source)
@@ -482,7 +482,7 @@ ZEND_COLD void zend_verify_property_type_error(zend_property_info *info, zval *p
 		} \
 	} while (0)
 
-ZEND_COLD void zend_match_unhandled_error(zval *value);
+ZEND_COLD void zend_match_unhandled_error(const zval *value);
 
 END_EXTERN_C()
 

Original file line number	Diff line number	Diff line change
`@@ -757,7 +757,7 @@ static bool zend_verify_weak_scalar_type_hint(uint32_t type_mask, zval *arg)`
`757`	`757`	`}`
`758`	`758`
`759`	`759`	`#if ZEND_DEBUG`
`760`		`-static bool can_convert_to_string(zval *zv) {`
	`760`	`+static bool can_convert_to_string(const zval *zv) {`
`761`	`761`	`/* We don't call cast_object here, because this check must be side-effect free. As this`
`762`	`762`	`* is only used for a sanity check of arginfo/zpp consistency, it's okay if we accept`
`763`	`763`	`* more than actually allowed here. */`
`@@ -769,7 +769,7 @@ static bool can_convert_to_string(zval *zv) {`
`769`	`769`	`}`
`770`	`770`
`771`	`771`	`/* Used to sanity-check internal arginfo types without performing any actual type conversions. */`
`772`		`-static bool zend_verify_weak_scalar_type_hint_no_sideeffect(uint32_t type_mask, zval *arg)`
	`772`	`+static bool zend_verify_weak_scalar_type_hint_no_sideeffect(uint32_t type_mask, const zval *arg)`
`773`	`773`	`{`
`774`	`774`	`zend_long lval;`
`775`	`775`	`double dval;`
`@@ -814,7 +814,7 @@ ZEND_API bool zend_verify_scalar_type_hint(uint32_t type_mask, zval *arg, bool s`
`814`	`814`	`return zend_verify_weak_scalar_type_hint(type_mask, arg);`
`815`	`815`	`}`
`816`	`816`
`817`		`-ZEND_COLD zend_never_inline void zend_verify_property_type_error(zend_property_info info, zval property)`
	`817`	`+ZEND_COLD zend_never_inline void zend_verify_property_type_error(const zend_property_info info, const zval property)`
`818`	`818`	`{`
`819`	`819`	`zend_string *type_str;`
`820`	`820`
`@@ -832,7 +832,7 @@ ZEND_COLD zend_never_inline void zend_verify_property_type_error(zend_property_i`
`832`	`832`	`zend_string_release(type_str);`
`833`	`833`	`}`
`834`	`834`
`835`		`-ZEND_COLD void zend_match_unhandled_error(zval *value)`
	`835`	`+ZEND_COLD void zend_match_unhandled_error(const zval *value)`
`836`	`836`	`{`
`837`	`837`	`smart_str msg = {0};`
`838`	`838`
`@@ -852,18 +852,18 @@ ZEND_COLD void zend_match_unhandled_error(zval *value)`
`852`	`852`	`}`
`853`	`853`
`854`	`854`	`ZEND_API ZEND_COLD void ZEND_FASTCALL zend_readonly_property_modification_error(`
`855`		`- zend_property_info *info) {`
	`855`	`+ const zend_property_info *info) {`
`856`	`856`	`zend_throw_error(NULL, "Cannot modify readonly property %s::$%s",`
`857`	`857`	`ZSTR_VAL(info->ce->name), zend_get_unmangled_property_name(info->name));`
`858`	`858`	`}`
`859`	`859`
`860`		`-ZEND_API ZEND_COLD void ZEND_FASTCALL zend_readonly_property_indirect_modification_error(zend_property_info *info)`
	`860`	`+ZEND_API ZEND_COLD void ZEND_FASTCALL zend_readonly_property_indirect_modification_error(const zend_property_info *info)`
`861`	`861`	`{`
`862`	`862`	`zend_throw_error(NULL, "Cannot indirectly modify readonly property %s::$%s",`
`863`	`863`	`ZSTR_VAL(info->ce->name), zend_get_unmangled_property_name(info->name));`
`864`	`864`	`}`
`865`	`865`
`866`		`-static zend_class_entry resolve_single_class_type(zend_string name, zend_class_entry *self_ce) {`
	`866`	`+static const zend_class_entry resolve_single_class_type(zend_string name, const zend_class_entry *self_ce) {`
`867`	`867`	`if (zend_string_equals_literal_ci(name, "self")) {`
`868`	`868`	`return self_ce;`
`869`	`869`	`} else if (zend_string_equals_literal_ci(name, "parent")) {`
`@@ -873,8 +873,8 @@ static zend_class_entry resolve_single_class_type(zend_string name, zend_class`
`873`	`873`	`}`
`874`	`874`	`}`
`875`	`875`
`876`		`-static zend_always_inline zend_class_entry *zend_ce_from_type(`
`877`		`- zend_property_info info, zend_type type) {`
	`876`	`+static zend_always_inline const zend_class_entry *zend_ce_from_type(`
	`877`	`+ const zend_property_info info, const zend_type type) {`
`878`	`878`	`ZEND_ASSERT(ZEND_TYPE_HAS_NAME(*type));`
`879`	`879`	`zend_string name = ZEND_TYPE_NAME(type);`
`880`	`880`	`if (ZSTR_HAS_CE_CACHE(name)) {`
`@@ -888,13 +888,13 @@ static zend_always_inline zend_class_entry *zend_ce_from_type(`
`888`	`888`	`}`
`889`	`889`
`890`	`890`	`static bool zend_check_intersection_for_property_class_type(zend_type_list *intersection_type_list,`
`891`		`- zend_property_info info, zend_class_entry object_ce)`
	`891`	`+ const zend_property_info info, const zend_class_entry object_ce)`
`892`	`892`	`{`
`893`	`893`	`zend_type *list_type;`
`894`	`894`
`895`	`895`	`ZEND_TYPE_LIST_FOREACH(intersection_type_list, list_type) {`
`896`	`896`	`ZEND_ASSERT(!ZEND_TYPE_HAS_LIST(*list_type));`
`897`		`- zend_class_entry *ce = zend_ce_from_type(info, list_type);`
	`897`	`+ const zend_class_entry *ce = zend_ce_from_type(info, list_type);`
`898`	`898`	`if (!ce \|\| !instanceof_function(object_ce, ce)) {`
`899`	`899`	`return false;`
`900`	`900`	`}`
`@@ -903,7 +903,7 @@ static bool zend_check_intersection_for_property_class_type(zend_type_list *inte`
`903`	`903`	`}`
`904`	`904`
`905`	`905`	`static bool zend_check_and_resolve_property_class_type(`
`906`		`- zend_property_info info, zend_class_entry object_ce) {`
	`906`	`+ const zend_property_info info, const zend_class_entry object_ce) {`
`907`	`907`	`if (ZEND_TYPE_HAS_LIST(info->type)) {`
`908`	`908`	`zend_type *list_type;`
`909`	`909`	`if (ZEND_TYPE_IS_INTERSECTION(info->type)) {`
`@@ -919,20 +919,20 @@ static bool zend_check_and_resolve_property_class_type(`
`919`	`919`	`continue;`
`920`	`920`	`}`
`921`	`921`	`ZEND_ASSERT(!ZEND_TYPE_HAS_LIST(*list_type));`
`922`		`- zend_class_entry *ce = zend_ce_from_type(info, list_type);`
	`922`	`+ const zend_class_entry *ce = zend_ce_from_type(info, list_type);`
`923`	`923`	`if (ce && instanceof_function(object_ce, ce)) {`
`924`	`924`	`return true;`
`925`	`925`	`}`
`926`	`926`	`} ZEND_TYPE_LIST_FOREACH_END();`
`927`	`927`	`return false;`
`928`	`928`	`}`
`929`	`929`	`} else {`
`930`		`- zend_class_entry *ce = zend_ce_from_type(info, &info->type);`
	`930`	`+ const zend_class_entry *ce = zend_ce_from_type(info, &info->type);`
`931`	`931`	`return ce && instanceof_function(object_ce, ce);`
`932`	`932`	`}`
`933`	`933`	`}`
`934`	`934`
`935`		`-static zend_always_inline bool i_zend_check_property_type(zend_property_info info, zval property, bool strict)`
	`935`	`+static zend_always_inline bool i_zend_check_property_type(const zend_property_info info, zval property, bool strict)`
`936`	`936`	`{`
`937`	`937`	`ZEND_ASSERT(!Z_ISREF_P(property));`
`938`	`938`	`if (EXPECTED(ZEND_TYPE_CONTAINS_CODE(info->type, Z_TYPE_P(property)))) {`
`@@ -949,7 +949,7 @@ static zend_always_inline bool i_zend_check_property_type(zend_property_info *in`
`949`	`949`	`return zend_verify_scalar_type_hint(type_mask, property, strict, 0);`
`950`	`950`	`}`
`951`	`951`
`952`		`-static zend_always_inline bool i_zend_verify_property_type(zend_property_info info, zval property, bool strict)`
	`952`	`+static zend_always_inline bool i_zend_verify_property_type(const zend_property_info info, zval property, bool strict)`
`953`	`953`	`{`
`954`	`954`	`if (i_zend_check_property_type(info, property, strict)) {`
`955`	`955`	`return 1;`
`@@ -959,7 +959,7 @@ static zend_always_inline bool i_zend_verify_property_type(zend_property_info *i`
`959`	`959`	`return 0;`
`960`	`960`	`}`
`961`	`961`
`962`		`-ZEND_API bool zend_never_inline zend_verify_property_type(zend_property_info info, zval property, bool strict) {`
	`962`	`+ZEND_API bool zend_never_inline zend_verify_property_type(const zend_property_info info, zval property, bool strict) {`
`963`	`963`	`return i_zend_verify_property_type(info, property, strict);`
`964`	`964`	`}`
`965`	`965`
`@@ -3360,7 +3360,7 @@ static zend_always_inline zend_result zend_fetch_static_property_address(zval **`
`3360`	`3360`	`return SUCCESS;`
`3361`	`3361`	`}`
`3362`	`3362`
`3363`		`-ZEND_API ZEND_COLD void zend_throw_ref_type_error_type(zend_property_info prop1, zend_property_info prop2, zval *zv) {`
	`3363`	`+ZEND_API ZEND_COLD void zend_throw_ref_type_error_type(const zend_property_info prop1, const zend_property_info prop2, const zval *zv) {`
`3364`	`3364`	`zend_string *type1_str = zend_type_to_string(prop1->type);`
`3365`	`3365`	`zend_string *type2_str = zend_type_to_string(prop2->type);`
`3366`	`3366`	`zend_type_error("Reference with value of type %s held by property %s::$%s of type %s is not compatible with property %s::$%s of type %s",`
`@@ -3376,7 +3376,7 @@ ZEND_API ZEND_COLD void zend_throw_ref_type_error_type(zend_property_info *prop1`
`3376`	`3376`	`zend_string_release(type2_str);`
`3377`	`3377`	`}`
`3378`	`3378`
`3379`		`-ZEND_API ZEND_COLD void zend_throw_ref_type_error_zval(zend_property_info prop, zval zv) {`
	`3379`	`+ZEND_API ZEND_COLD void zend_throw_ref_type_error_zval(const zend_property_info prop, const zval zv) {`
`3380`	`3380`	`zend_string *type_str = zend_type_to_string(prop->type);`
`3381`	`3381`	`zend_type_error("Cannot assign %s to reference held by property %s::$%s of type %s",`
`3382`	`3382`	`zend_zval_type_name(zv),`
`@@ -3387,7 +3387,7 @@ ZEND_API ZEND_COLD void zend_throw_ref_type_error_zval(zend_property_info *prop,`
`3387`	`3387`	`zend_string_release(type_str);`
`3388`	`3388`	`}`
`3389`	`3389`
`3390`		`-ZEND_API ZEND_COLD void zend_throw_conflicting_coercion_error(zend_property_info prop1, zend_property_info prop2, zval *zv) {`
	`3390`	`+ZEND_API ZEND_COLD void zend_throw_conflicting_coercion_error(const zend_property_info prop1, const zend_property_info prop2, const zval *zv) {`
`3391`	`3391`	`zend_string *type1_str = zend_type_to_string(prop1->type);`
`3392`	`3392`	`zend_string *type2_str = zend_type_to_string(prop2->type);`
`3393`	`3393`	`zend_type_error("Cannot assign %s to reference held by property %s::$%s of type %s and property %s::$%s of type %s, as this would result in an inconsistent type conversion",`
`@@ -3405,7 +3405,7 @@ ZEND_API ZEND_COLD void zend_throw_conflicting_coercion_error(zend_property_info`
`3405`	`3405`
`3406`	`3406`	`/* 1: valid, 0: invalid, -1: may be valid after type coercion */`
`3407`	`3407`	`static zend_always_inline int i_zend_verify_type_assignable_zval(`
`3408`		`- zend_property_info info, zval zv, bool strict) {`
	`3408`	`+ const zend_property_info info, const zval zv, bool strict) {`
`3409`	`3409`	`zend_type type = info->type;`
`3410`	`3410`	`uint32_t type_mask;`
`3411`	`3411`	`zend_uchar zv_type = Z_TYPE_P(zv);`
`@@ -3447,11 +3447,11 @@ static zend_always_inline int i_zend_verify_type_assignable_zval(`
`3447`	`3447`
`3448`	`3448`	`ZEND_API bool ZEND_FASTCALL zend_verify_ref_assignable_zval(zend_reference ref, zval zv, bool strict)`
`3449`	`3449`	`{`
`3450`		`- zend_property_info *prop;`
	`3450`	`+ const zend_property_info *prop;`
`3451`	`3451`
`3452`	`3452`	`/* The value must satisfy each property type, and coerce to the same value for each property`
`3453`	`3453`	`* type. Remember the first coerced type and value we've seen for this purpose. */`
`3454`		`- zend_property_info *first_prop = NULL;`
	`3454`	`+ const zend_property_info *first_prop = NULL;`
`3455`	`3455`	`zval coerced_value;`
`3456`	`3456`	`ZVAL_UNDEF(&coerced_value);`
`3457`	`3457`
`@@ -3557,7 +3557,7 @@ ZEND_API zval* zend_assign_to_typed_ref(zval variable_ptr, zval orig_value, ze`
`3557`	`3557`	`return variable_ptr;`
`3558`	`3558`	`}`
`3559`	`3559`
`3560`		`-ZEND_API bool ZEND_FASTCALL zend_verify_prop_assignable_by_ref(zend_property_info prop_info, zval orig_val, bool strict) {`
	`3560`	`+ZEND_API bool ZEND_FASTCALL zend_verify_prop_assignable_by_ref(const zend_property_info prop_info, zval orig_val, bool strict) {`
`3561`	`3561`	`zval *val = orig_val;`
`3562`	`3562`	`if (Z_ISREF_P(val) && ZEND_REF_HAS_TYPE_SOURCES(Z_REF_P(val))) {`
`3563`	`3563`	`int result;`
`@@ -3574,7 +3574,7 @@ ZEND_API bool ZEND_FASTCALL zend_verify_prop_assignable_by_ref(zend_property_inf`
`3574`	`3574`	`zval tmp;`
`3575`	`3575`	`ZVAL_COPY(&tmp, val);`
`3576`	`3576`	`if (zend_verify_weak_scalar_type_hint(ZEND_TYPE_FULL_MASK(prop_info->type), &tmp)) {`
`3577`		`- zend_property_info *ref_prop = ZEND_REF_FIRST_SOURCE(Z_REF_P(orig_val));`
	`3577`	`+ const zend_property_info *ref_prop = ZEND_REF_FIRST_SOURCE(Z_REF_P(orig_val));`
`3578`	`3578`	`zend_throw_ref_type_error_type(ref_prop, prop_info, val);`
`3579`	`3579`	`zval_ptr_dtor(&tmp);`
`3580`	`3580`	`return 0;`
`@@ -3615,7 +3615,7 @@ ZEND_API void ZEND_FASTCALL zend_ref_add_type_source(zend_property_info_source_l`
`3615`	`3615`	`source_list->list = ZEND_PROPERTY_INFO_SOURCE_FROM_LIST(list);`
`3616`	`3616`	`}`
`3617`	`3617`
`3618`		`-ZEND_API void ZEND_FASTCALL zend_ref_del_type_source(zend_property_info_source_list source_list, zend_property_info prop)`
	`3618`	`+ZEND_API void ZEND_FASTCALL zend_ref_del_type_source(zend_property_info_source_list source_list, const zend_property_info prop)`
`3619`	`3619`	`{`
`3620`	`3620`	`zend_property_info_list *list = ZEND_PROPERTY_INFO_SOURCE_TO_LIST(source_list->list);`
`3621`	`3621`	`zend_property_info ptr, end;`