Feedback fixes (part 1)

Removes UPGRADING changes to avoid conflicts
Still need `--file-cache-prime` fixes

Author: DanielEScherzer

UPGRADING

@@ -130,10 +130,6 @@ PHP 8.5 UPGRADE NOTES
     RFC: https://wiki.php.net/rfc/marking_return_value_as_important
   . Added asymmetric visibility support for static properties.
     RFC: https://wiki.php.net/rfc/static-aviz
-  . Added support for attributes on compile-time non-class constants.
-  . Added constant Attribute::TARGET_CONSTANT.
-  . The #[\Deprecated] attribute can now be used on constants.
-    RFC: https://wiki.php.net/rfc/attributes-on-constants
 
 - Curl:
   . Added support for share handles that are persisted across multiple PHP

Zend/zend_ast.c

@@ -1596,8 +1596,8 @@ static ZEND_COLD void zend_ast_export_var(smart_str *str, zend_ast *ast, int pri
 	smart_str_appendc(str, '}');
 }
 
-// Use zend_ast_export_list() unless fewer than `list->children` children
-// should be exported
+/* Use zend_ast_export_list() unless fewer than `list->children` children should
+ * be exported. */
 static ZEND_COLD void zend_ast_export_list_ex(smart_str *str, zend_ast_list *list, bool separator, int priority, int indent, int children)
 {
 	ZEND_ASSERT(children <= list->children);
@@ -2190,7 +2190,7 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
 		}
 
 		case ZEND_AST_CONST_DECL: {
-			zend_ast_list *ast_list = (zend_ast_list *)ast;
+			zend_ast_list *ast_list = zend_ast_get_list(ast);
 			// Attributes are stored at the end of the list if present;
 			if (ast_list->child[ast_list->children - 1]->kind == ZEND_AST_ATTRIBUTE_LIST) {
 				zend_ast_export_attributes(

Zend/zend_compile.c

@@ -9480,7 +9480,8 @@ static void zend_compile_const_decl(zend_ast *ast) /* {{{ */
 	zend_op *last_op = NULL;
 	for (i = 0; i < list->children; ++i) {
 		zend_ast *const_ast = list->child[i];
-		if (i == list->children - 1 && const_ast->kind == ZEND_AST_ATTRIBUTE_LIST) {
+		if (const_ast->kind == ZEND_AST_ATTRIBUTE_LIST) {
+			ZEND_ASSERT(i == list->children - 1);
 			attributes_ast = const_ast;
 			continue;
 		}
@@ -9522,9 +9523,9 @@ static void zend_compile_const_decl(zend_ast *ast) /* {{{ */
 	if (attributes_ast == NULL) {
 		return;
 	}
-	// Validate: attributes can only be applied to one constant at a time
-	// Since we store the AST for the attributes in the list of children,
-	// there should be exactly 2 children
+	/* Validate: attributes can only be applied to one constant at a time
+	 * Since we store the AST for the attributes in the list of children,
+	 * there should be exactly 2 children. */
 	if (list->children > 2) {
 		zend_error_noreturn(
 			E_COMPILE_ERROR,

Zend/zend_compile.h

@@ -395,7 +395,9 @@ typedef struct _zend_oparray_context {
 /* has #[\Override] attribute                             |     |     |     */
 #define ZEND_ACC_OVERRIDE                (1 << 28) /*     |  X  |     |     */
 /*                                                        |     |     |     */
-/* Has IS_PTR operands that needs special cleaning        |     |     |     */
+/* Has IS_PTR operands that needs special cleaning; same  |     |     |     */
+/* value as ZEND_ACC_OVERRIDE but override is for class   |     |     |     */
+/* methods and this is for the top level op array         |     |     |     */
 #define ZEND_ACC_PTR_OPS                 (1 << 28) /*     |  X  |     |     */
 /*                                                        |     |     |     */
 /* has #[\NoDiscard] attribute                            |     |     |     */

Zend/zend_opcode.c

@@ -580,7 +580,8 @@ ZEND_API void destroy_op_array(zend_op_array *op_array)
 		efree(op_array->vars);
 	}
 
-	if (op_array->fn_flags & ZEND_ACC_PTR_OPS) {
+	/* ZEND_ACC_PTR_OPS and ZEND_ACC_OVERRIDE use the same value */
+	if ((op_array->fn_flags & ZEND_ACC_PTR_OPS) && !op_array->function_name) {
 		zend_op *op = op_array->opcodes;
 		zend_op *end = op + op_array->last;
 		while (op < end) {

Zend/zend_vm_def.h

@@ -8345,7 +8345,6 @@ ZEND_VM_HANDLER(210, ZEND_DECLARE_ATTRIBUTED_CONST, CONST, CONST)
 
 	FREE_OP1();
 	FREE_OP2();
-	FREE_OP_DATA();
 	/* two opcodes used, second one is the data with attributes */
 	ZEND_VM_NEXT_OPCODE_EX(1, 2);
 }

Zend/zend_vm_execute.h

@@ -69,7 +69,7 @@ method ``ReflectionConstant::getFileName()``.
  attributes
 ************
 
-Finally, the ``attributes`` holds a ``HashTable`` (essentially an array) with the details of the
-attributes that were applied to the constant. Note that attributes can only be added to constants
-declared at compile time via ``const``, e.g. ``const EXAMPLE = 123``, not those declared at runtime,
-e.g. ``define( 'EXAMPLE', 123 );``.
+The ``attributes`` holds a ``HashTable`` (essentially an array) with the details of the attributes
+that were applied to the constant. Note that attributes can only be added to constants declared at
+compile time via ``const``, e.g. ``const EXAMPLE = 123``, not those declared at runtime, e.g.
+``define( 'EXAMPLE', 123 );``.

docs/source/core/data-structures/zend_constant.rst

@@ -266,7 +266,8 @@ static void zend_persist_op_array_calc_ex(zend_op_array *op_array)
 	zend_shared_alloc_register_xlat_entry(op_array->opcodes, op_array->opcodes);
 	ADD_SIZE(sizeof(zend_op) * op_array->last);
 
-	if (op_array->fn_flags & ZEND_ACC_PTR_OPS) {
+	/* ZEND_ACC_PTR_OPS and ZEND_ACC_OVERRIDE use the same value */
+	if ((op_array->fn_flags & ZEND_ACC_PTR_OPS) && !op_array->function_name) {
 		zend_op *op = op_array->opcodes;
 		zend_op *end = op + op_array->last;
 		while (op < end) {