Skip to content

zend_builtin_functions.c: add const qualifiers #21487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Girgias merged 2 commits into from
Mar 23, 2026
+16 −20
Merged

zend_builtin_functions.c: add const qualifiers #21487

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1aebd2
zend_builtin_functions.c: add const qualifiers
Girgias Mar 21, 2026
6a32af4
[skip ci] nit
Girgias Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 16 additions & 20 deletions Zend/zend_builtin_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ ZEND_FUNCTION(clone)

/* clone() also exists as the ZEND_CLONE OPcode and both implementations must be kept in sync. */

zend_class_entry *scope = zend_get_executed_scope();
const zend_class_entry *scope = zend_get_executed_scope();

zend_class_entry *ce = zobj->ce;
zend_function *clone = ce->clone;
const zend_class_entry *ce = zobj->ce;
const zend_function *clone = ce->clone;

if (UNEXPECTED(zobj->handlers->clone_obj == NULL)) {
zend_throw_error(NULL, "Trying to clone an uncloneable object of class %s", ZSTR_VAL(ce->name));
Expand Down Expand Up @@ -239,7 +239,7 @@ ZEND_FUNCTION(gc_status)
/* {{{ Get the number of arguments that were passed to the function */
ZEND_FUNCTION(func_num_args)
{
zend_execute_data *ex = EX(prev_execute_data);
const zend_execute_data *ex = EX(prev_execute_data);

ZEND_PARSE_PARAMETERS_NONE();

Expand Down Expand Up @@ -527,7 +527,7 @@ static bool validate_constant_array_argument(HashTable *ht, int argument_number)
}
/* }}} */

static void copy_constant_array(zval *dst, zval *src) /* {{{ */
static void copy_constant_array(zval *dst, const zval *src) /* {{{ */
{
zend_string *key;
zend_ulong idx;
Expand Down Expand Up @@ -647,11 +647,9 @@ ZEND_FUNCTION(get_class)
/* {{{ Retrieves the "Late Static Binding" class name */
ZEND_FUNCTION(get_called_class)
{
zend_class_entry *called_scope;

ZEND_PARSE_PARAMETERS_NONE();

called_scope = zend_get_called_scope(execute_data);
const zend_class_entry *called_scope = zend_get_called_scope(execute_data);
if (!called_scope) {
zend_throw_error(NULL, "get_called_class() must be called from within a class");
RETURN_THROWS();
Expand Down Expand Up @@ -691,8 +689,7 @@ static void is_a_impl(INTERNAL_FUNCTION_PARAMETERS, bool only_subclass) /* {{{ *
{
zval *obj;
zend_string *class_name;
zend_class_entry *instance_ce;
zend_class_entry *ce;
const zend_class_entry *instance_ce;
bool allow_string = only_subclass;
bool retval;

Expand Down Expand Up @@ -723,7 +720,7 @@ static void is_a_impl(INTERNAL_FUNCTION_PARAMETERS, bool only_subclass) /* {{{ *
if (!only_subclass && EXPECTED(zend_string_equals(instance_ce->name, class_name))) {
retval = 1;
} else {
ce = zend_lookup_class_ex(class_name, NULL, ZEND_FETCH_CLASS_NO_AUTOLOAD);
const zend_class_entry *ce = zend_lookup_class_ex(class_name, NULL, ZEND_FETCH_CLASS_NO_AUTOLOAD);
if (!ce) {
retval = 0;
} else {
Expand Down Expand Up @@ -754,7 +751,7 @@ ZEND_FUNCTION(is_a)
/* }}} */

/* {{{ add_class_vars */
static void add_class_vars(zend_class_entry *scope, zend_class_entry *ce, bool statics, zval *return_value)
static void add_class_vars(const zend_class_entry *scope, zend_class_entry *ce, bool statics, const zval *return_value)
{
zend_property_info *prop_info;
zval *prop, prop_copy;
Expand Down Expand Up @@ -805,7 +802,7 @@ static void add_class_vars(zend_class_entry *scope, zend_class_entry *ce, bool s
/* {{{ Returns an array of default properties of the class. */
ZEND_FUNCTION(get_class_vars)
{
zend_class_entry *ce = NULL, *scope;
zend_class_entry *ce = NULL;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "C", &ce) == FAILURE) {
RETURN_THROWS();
Expand All @@ -818,7 +815,7 @@ ZEND_FUNCTION(get_class_vars)
}
}

scope = zend_get_executed_scope();
const zend_class_entry *scope = zend_get_executed_scope();
add_class_vars(scope, ce, false, return_value);
add_class_vars(scope, ce, true, return_value);
}
Expand Down Expand Up @@ -944,15 +941,14 @@ ZEND_FUNCTION(get_class_methods)
{
zval method_name;
zend_class_entry *ce = NULL;
zend_class_entry *scope;
zend_function *mptr;

ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_OBJ_OR_CLASS_NAME(ce)
ZEND_PARSE_PARAMETERS_END();

array_init(return_value);
scope = zend_get_executed_scope();
const zend_class_entry *scope = zend_get_executed_scope();

ZEND_HASH_MAP_FOREACH_PTR(&ce->function_table, mptr) {
if (zend_check_method_accessible(mptr, scope)) {
Expand Down Expand Up @@ -1027,7 +1023,7 @@ ZEND_FUNCTION(method_exists)
}
/* }}} */

static void _property_exists(zval *return_value, zval *object, zend_string *property)
static void _property_exists(zval *return_value, const zval *object, zend_string *property)
{
zend_class_entry *ce;
zend_property_info *property_info;
Expand Down Expand Up @@ -1091,7 +1087,7 @@ flf_clean:;
static zend_always_inline void _class_exists_impl(zval *return_value, zend_string *name, bool autoload, int flags, int skip_flags) /* {{{ */
{
zend_string *lcname;
zend_class_entry *ce;
const zend_class_entry *ce;

if (ZSTR_HAS_CE_CACHE(name)) {
ce = ZSTR_GET_CE_CACHE(name);
Expand Down Expand Up @@ -1616,7 +1612,7 @@ ZEND_FUNCTION(get_resources)
}
/* }}} */

static void add_zendext_info(zend_extension *ext, void *arg) /* {{{ */
static void add_zendext_info(const zend_extension *ext, void *arg) /* {{{ */
{
zval *name_array = (zval *)arg;
add_next_index_string(name_array, ext->name);
Expand Down Expand Up @@ -1719,7 +1715,7 @@ ZEND_FUNCTION(get_defined_constants)

static bool backtrace_is_arg_sensitive(const zend_execute_data *call, uint32_t offset)
{
zend_attribute *attribute = zend_get_parameter_attribute_str(
const zend_attribute *attribute = zend_get_parameter_attribute_str(
call->func->common.attributes,
"sensitiveparameter",
sizeof("sensitiveparameter") - 1,
Expand Down