Additional purity

Author: TimWolla

Zend/zend_API.c

@@ -116,7 +116,7 @@ ZEND_API ZEND_COLD void zend_wrong_property_read(zval *object, zval *property)
 }
 
 /* Argument parsing API -- andrei */
-ZEND_API const char *zend_get_type_by_const(int type) /* {{{ */
+ZEND_ATTRIBUTE_CONST ZEND_API const char *zend_get_type_by_const(int type) /* {{{ */
 {
 	switch(type) {
 		case IS_FALSE:
@@ -152,7 +152,7 @@ ZEND_API const char *zend_get_type_by_const(int type) /* {{{ */
 }
 /* }}} */
 
-ZEND_API const char *zend_zval_value_name(const zval *arg)
+ZEND_ATTRIBUTE_PURE ZEND_API const char *zend_zval_value_name(const zval *arg)
 {
 	ZVAL_DEREF(arg);
 
@@ -171,7 +171,7 @@ ZEND_API const char *zend_zval_value_name(const zval *arg)
 	return zend_get_type_by_const(Z_TYPE_P(arg));
 }
 
-ZEND_API const char *zend_zval_type_name(const zval *arg)
+ZEND_ATTRIBUTE_PURE ZEND_API const char *zend_zval_type_name(const zval *arg)
 {
 	ZVAL_DEREF(arg);
 
@@ -3762,7 +3762,7 @@ ZEND_API zend_result zend_disable_class(const char *class_name, size_t class_nam
 }
 /* }}} */
 
-static zend_always_inline zend_class_entry *get_scope(zend_execute_data *frame)
+ZEND_ATTRIBUTE_PURE static zend_always_inline zend_class_entry *get_scope(const zend_execute_data *frame)
 {
 	return frame && frame->func ? frame->func->common.scope : NULL;
 }

Zend/zend_API.h

@@ -366,8 +366,8 @@ ZEND_API zend_result zend_parse_parameters_ex(int flags, uint32_t num_args, cons
 /* NOTE: This must have at least one value in __VA_ARGS__ for the expression to be valid */
 #define zend_parse_parameters_throw(num_args, ...) \
 	zend_parse_parameters(num_args, __VA_ARGS__)
-ZEND_API const char *zend_zval_type_name(const zval *arg);
-ZEND_API const char *zend_zval_value_name(const zval *arg);
+ZEND_ATTRIBUTE_PURE ZEND_API const char *zend_zval_type_name(const zval *arg);
+ZEND_ATTRIBUTE_PURE ZEND_API const char *zend_zval_value_name(const zval *arg);
 ZEND_API zend_string *zend_zval_get_legacy_type(const zval *arg);
 
 ZEND_API zend_result zend_parse_method_parameters(uint32_t num_args, zval *this_ptr, const char *type_spec, ...);
@@ -520,7 +520,7 @@ ZEND_API zval *zend_read_property(zend_class_entry *scope, zend_object *object,
 ZEND_API zval *zend_read_static_property_ex(zend_class_entry *scope, zend_string *name, bool silent);
 ZEND_API zval *zend_read_static_property(zend_class_entry *scope, const char *name, size_t name_length, bool silent);
 
-ZEND_API const char *zend_get_type_by_const(int type);
+ZEND_ATTRIBUTE_CONST ZEND_API const char *zend_get_type_by_const(int type);
 
 #define ZEND_THIS                           (&EX(This))
 

Zend/zend_execute.h

@@ -443,12 +443,12 @@ ZEND_API void ZEND_FASTCALL zend_free_extra_named_params(zend_array *extra_named
 
 /* services */
 ZEND_API const char *get_active_class_name(const char **space);
-ZEND_API const char *get_active_function_name(void);
-ZEND_API const char *get_active_function_arg_name(uint32_t arg_num);
-ZEND_API const char *get_function_arg_name(const zend_function *func, uint32_t arg_num);
-ZEND_API zend_function *zend_active_function_ex(zend_execute_data *execute_data);
+ZEND_ATTRIBUTE_PURE ZEND_API const char *get_active_function_name(void);
+ZEND_ATTRIBUTE_PURE ZEND_API const char *get_active_function_arg_name(uint32_t arg_num);
+ZEND_ATTRIBUTE_PURE ZEND_API const char *get_function_arg_name(const zend_function *func, uint32_t arg_num);
+ZEND_ATTRIBUTE_PURE ZEND_API zend_function *zend_active_function_ex(const zend_execute_data *execute_data);
 
-static zend_always_inline zend_function *zend_active_function(void)
+ZEND_ATTRIBUTE_PURE static zend_always_inline zend_function *zend_active_function(void)
 {
 	zend_function *func = EG(current_execute_data)->func;
 	if (ZEND_USER_CODE(func->type)) {
@@ -464,7 +464,7 @@ ZEND_ATTRIBUTE_PURE ZEND_API const char *zend_get_executed_filename(void);
 ZEND_ATTRIBUTE_PURE ZEND_API zend_string *zend_get_executed_filename_ex(void);
 ZEND_ATTRIBUTE_PURE ZEND_API uint32_t zend_get_executed_lineno(void);
 ZEND_ATTRIBUTE_PURE ZEND_API zend_class_entry *zend_get_executed_scope(void);
-ZEND_API bool zend_is_executing(void);
+ZEND_ATTRIBUTE_PURE ZEND_API bool zend_is_executing(void);
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_cannot_pass_by_reference(uint32_t arg_num);
 
 ZEND_API void zend_set_timeout(zend_long seconds, bool reset_signals);

Zend/zend_execute_API.c

@@ -567,7 +567,7 @@ ZEND_API const char *get_active_class_name(const char **space) /* {{{ */
 }
 /* }}} */
 
-ZEND_API const char *get_active_function_name(void) /* {{{ */
+ZEND_ATTRIBUTE_PURE ZEND_API const char *get_active_function_name(void) /* {{{ */
 {
 	zend_function *func;
 
@@ -597,7 +597,7 @@ ZEND_API const char *get_active_function_name(void) /* {{{ */
 }
 /* }}} */
 
-ZEND_API zend_function *zend_active_function_ex(zend_execute_data *execute_data)
+ZEND_ATTRIBUTE_PURE ZEND_API zend_function *zend_active_function_ex(const zend_execute_data *execute_data)
 {
 	zend_function *func = EX(func);
 
@@ -630,7 +630,7 @@ ZEND_API zend_string *get_function_or_method_name(const zend_function *func) /*
 }
 /* }}} */
 
-ZEND_API const char *get_active_function_arg_name(uint32_t arg_num) /* {{{ */
+ZEND_ATTRIBUTE_PURE ZEND_API const char *get_active_function_arg_name(uint32_t arg_num) /* {{{ */
 {
 	if (!zend_is_executing()) {
 		return NULL;
@@ -642,7 +642,7 @@ ZEND_API const char *get_active_function_arg_name(uint32_t arg_num) /* {{{ */
 }
 /* }}} */
 
-ZEND_API const char *get_function_arg_name(const zend_function *func, uint32_t arg_num) /* {{{ */
+ZEND_ATTRIBUTE_PURE ZEND_API const char *get_function_arg_name(const zend_function *func, uint32_t arg_num) /* {{{ */
 {
 	if (!func || arg_num == 0 || func->common.num_args < arg_num) {
 		return NULL;
@@ -726,7 +726,7 @@ ZEND_ATTRIBUTE_PURE ZEND_API zend_class_entry *zend_get_executed_scope(void) /*
 }
 /* }}} */
 
-ZEND_API bool zend_is_executing(void) /* {{{ */
+ZEND_ATTRIBUTE_PURE ZEND_API bool zend_is_executing(void) /* {{{ */
 {
 	return EG(current_execute_data) != 0;
 }