Rebase issues

Author: DanielEScherzer

Zend/zend_attributes.c

@@ -38,7 +38,7 @@ static zend_object_handlers attributes_object_handlers_sensitive_parameter_value
 
 static HashTable internal_attributes;
 
-uint32_t zend_attribute_attribute_get_flags(zend_attribute *attr, zend_class_entry *scope)
+uint32_t zend_attribute_attribute_get_flags(const zend_attribute *attr, zend_class_entry *scope)
 {
 	// TODO: More proper signature validation: Too many args, incorrect arg names.
 	if (attr->argc > 0) {
@@ -70,7 +70,7 @@ uint32_t zend_attribute_attribute_get_flags(zend_attribute *attr, zend_class_ent
 	return ZEND_ATTRIBUTE_TARGET_ALL;
 }
 
-static void validate_allow_dynamic_properties(
+static zend_string *validate_allow_dynamic_properties(
 		zend_attribute *attr, uint32_t target, zend_class_entry *scope)
 {
 	ZEND_ASSERT(scope != NULL);

Zend/zend_attributes.stub.php

@@ -103,4 +103,3 @@ public function __construct(?string $message = null) {}
  */
 #[Attribute(Attribute::TARGET_ALL)]
 final class DelayedTargetValidation {}
-

Zend/zend_compile.c

@@ -7844,7 +7844,7 @@ static void zend_compile_attributes(
 			if (args) {
 				ZEND_ASSERT(args->kind == ZEND_AST_ARG_LIST);
 
-				bool uses_named_args = 0;
+				bool uses_named_args = false;
 				for (j = 0; j < args->children; j++) {
 					zend_ast **arg_ast_ptr = &args->child[j];
 					zend_ast *arg_ast = *arg_ast_ptr;
@@ -7857,7 +7857,7 @@ static void zend_compile_attributes(
 					if (arg_ast->kind == ZEND_AST_NAMED_ARG) {
 						attr->args[j].name = zend_string_copy(zend_ast_get_str(arg_ast->child[0]));
 						arg_ast_ptr = &arg_ast->child[1];
-						uses_named_args = 1;
+						uses_named_args = true;
 
 						for (uint32_t k = 0; k < j; k++) {
 							if (attr->args[k].name &&

ext/opcache/zend_accelerator_util_funcs.c

@@ -214,7 +214,7 @@ static zend_always_inline void _zend_accel_class_hash_copy(HashTable *target, co
 				 * value. */
 				continue;
 			} else if (UNEXPECTED(!ZCG(accel_directives).ignore_dups)) {
-				zend_class_entry *ce1;
+				const zend_class_entry *ce1;
 				Z_CE_FROM_ZVAL(ce1, p->val);
 				if (!(ce1->ce_flags & ZEND_ACC_ANON_CLASS)) {
 					CG(in_compilation) = 1;
@@ -354,8 +354,8 @@ static void zend_accel_do_delayed_early_binding(
 	CG(compiled_filename) = persistent_script->script.filename;
 	CG(in_compilation) = 1;
 	for (uint32_t i = 0; i < persistent_script->num_early_bindings; i++) {
-		zend_early_binding *early_binding = &persistent_script->early_bindings[i];
-		zval *ce_or_alias = zend_hash_find_ex(EG(class_table), early_binding->lcname, 1);
+		const zend_early_binding *early_binding = &persistent_script->early_bindings[i];
+		const zval *ce_or_alias = zend_hash_find_ex(EG(class_table), early_binding->lcname, 1);
 		if (!ce_or_alias) {
 			zval *zv = zend_hash_find_known_hash(EG(class_table), early_binding->rtd_key);
 			zend_class_entry *ce = NULL;