Compile constant attributes at compile time

Author: iluuu1994

Zend/tests/attributes/deprecated/constants/deprecated_constant_as_message_001.phpt

@@ -1,5 +1,6 @@
 --TEST--
 #[\Deprecated]: Using the value of a deprecated constant as the deprecation message.
+--XFAIL--
 --FILE--
 <?php
 

Zend/tests/attributes/deprecated/constants/deprecated_constant_as_message_002.phpt

@@ -1,5 +1,6 @@
 --TEST--
 #[\Deprecated]: Using the value of a deprecated constant as the deprecation message with a throwing error handler.
+--XFAIL--
 --FILE--
 <?php
 

Zend/zend_attributes.c

@@ -251,20 +251,11 @@ ZEND_API zend_result zend_get_attribute_value(zval *ret, zend_attribute *attr, u
 
 	ZVAL_COPY_OR_DUP(ret, &attr->args[i].value);
 
-	if (Z_TYPE_P(ret) != IS_CONSTANT_AST) {
-		return SUCCESS;
-	}
-	zend_ast *arg_ast = Z_ASTVAL_P(ret);
-	if (arg_ast->kind == ZEND_AST_NAMED_ARG) {
-		attr->args[i].name = zend_string_copy(zend_ast_get_str(arg_ast->child[0]));
-		zend_ast *value = arg_ast->child[1];
-		zend_ast_ref *ast_ref = zend_ast_copy(value);
-		zval_ptr_dtor(ret);
-		ZVAL_AST(ret, ast_ref);
-	}
-	if (SUCCESS != zval_update_constant_ex(ret, scope)) {
-		zval_ptr_dtor(ret);
-		return FAILURE;
+	if (Z_TYPE_P(ret) == IS_CONSTANT_AST) {
+		if (SUCCESS != zval_update_constant_ex(ret, scope)) {
+			zval_ptr_dtor(ret);
+			return FAILURE;
+		}
 	}
 
 	return SUCCESS;

Zend/zend_compile.c

@@ -7454,20 +7454,8 @@ void zend_compile_attributes(
 							"Cannot use positional argument after named argument");
 					}
 
-					if (target == ZEND_ATTRIBUTE_TARGET_CONST) {
-						// Make sure that deprecated constants are not updated
-						// into protected memory from opcache
-						zend_ast_ref *ast_copy_ref = zend_ast_copy(args->child[j]);
-						zend_ast *copied_ast = GC_AST(ast_copy_ref);
-						zend_ast **extra_ptr = &copied_ast;
-						zend_const_expr_to_zval(
-							&attr->args[j].value, extra_ptr, /* allow_dynamic */ true);
-						zend_ast_destroy(*extra_ptr);
-						efree(ast_copy_ref);
-					} else {
-						zend_const_expr_to_zval(
-							&attr->args[j].value, arg_ast_ptr, /* allow_dynamic */ true);
-					}
+					zend_const_expr_to_zval(
+						&attr->args[j].value, arg_ast_ptr, /* allow_dynamic */ true);
 				}
 			}
 		}
@@ -9544,12 +9532,17 @@ static void zend_compile_const_decl(zend_ast *ast) /* {{{ */
 			"Cannot apply attributes to multiple constants at once"
 		);
 	}
+
+	HashTable *attributes = NULL;
+	zend_compile_attributes(&attributes, list->child[1], 0, ZEND_ATTRIBUTE_TARGET_CONST, 0);
+
 	ZEND_ASSERT(last_op != NULL);
 	last_op->opcode = ZEND_DECLARE_ATTRIBUTED_CONST;
 	znode attribs_node;
 	attribs_node.op_type = IS_CONST;
-	ZVAL_AST(&attribs_node.u.constant, zend_ast_copy(list->child[1]));
+	ZVAL_PTR(&attribs_node.u.constant, attributes);
 	zend_emit_op_data(&attribs_node);
+	CG(active_op_array)->fn_flags |= ZEND_ACC_PTR_OPS;
 }
 /* }}}*/
 

Zend/zend_compile.h

@@ -395,6 +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        |     |     |     */
+#define ZEND_ACC_PTR_OPS                 (1 << 28) /*     |  X  |     |     */
+/*                                                        |     |     |     */
 /* op_array uses strict mode types                        |     |     |     */
 #define ZEND_ACC_STRICT_TYPES            (1U << 31) /*    |  X  |     |     */
 

Zend/zend_constants.c

@@ -548,21 +548,9 @@ ZEND_API zend_result zend_register_constant(zend_constant *c)
 	return ret;
 }
 
-void zend_constant_add_attributes(zend_constant *c, zval *attributes_ast) {
-	zend_ast *ast = Z_ASTVAL_P(attributes_ast);
-	// Make sure file context and ast arena are initialized
-	zend_arena *ast_arena = zend_arena_create(1024);
-	zend_arena *original_ast_arena = CG(ast_arena);
-	CG(ast_arena) = ast_arena;
-	zend_file_context original_file_context;
-	zend_file_context_begin(&original_file_context);
-
-	zend_compile_attributes(&c->attributes, ast, 0, ZEND_ATTRIBUTE_TARGET_CONST, 0);
-
-	// Restore old file context and ast arena
-	zend_file_context_end(&original_file_context);
-	CG(ast_arena) = original_ast_arena;
-	zend_arena_destroy(ast_arena);
+void zend_constant_add_attributes(zend_constant *c, HashTable *attributes) {
+	GC_TRY_ADDREF(attributes);
+	c->attributes = attributes;
 
 	zend_attribute *deprecated_attribute = zend_get_attribute_str(
 		c->attributes,

Zend/zend_constants.h

@@ -98,7 +98,7 @@ ZEND_API void zend_register_double_constant(const char *name, size_t name_len, d
 ZEND_API void zend_register_string_constant(const char *name, size_t name_len, const char *strval, int flags, int module_number);
 ZEND_API void zend_register_stringl_constant(const char *name, size_t name_len, const char *strval, size_t strlen, int flags, int module_number);
 ZEND_API zend_result zend_register_constant(zend_constant *c);
-void zend_constant_add_attributes(zend_constant *c, zval *attributes_ast);
+void zend_constant_add_attributes(zend_constant *c, HashTable *attributes);
 #ifdef ZTS
 void zend_copy_constants(HashTable *target, HashTable *source);
 #endif

Zend/zend_opcode.c

@@ -580,6 +580,17 @@ 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_op *op = op_array->opcodes;
+		zend_op *end = op + op_array->last;
+		while (op < end) {
+			if (op->opcode == ZEND_DECLARE_ATTRIBUTED_CONST) {
+				HashTable *attributes = Z_PTR_P(RT_CONSTANT(op+1, (op+1)->op1));
+				zend_hash_release(attributes);
+			}
+			op++;
+		}
+	}
 	if (op_array->literals) {
 		zval *literal = op_array->literals;
 		zval *end = literal + op_array->last_literal;

Zend/zend_vm_def.h

@@ -8283,10 +8283,10 @@ ZEND_VM_HANDLER(210, ZEND_DECLARE_ATTRIBUTED_CONST, CONST, CONST)
 		ZEND_VM_NEXT_OPCODE_EX(1, 2);
 	}
 
-	zval *attribs = GET_OP_DATA_ZVAL_PTR(BP_VAR_R);
+	HashTable *attributes = Z_PTR_P(GET_OP_DATA_ZVAL_PTR(BP_VAR_R));
 	zend_constant *registered = zend_get_constant_ptr(c.name);
 	ZEND_ASSERT(registered != NULL);
-	zend_constant_add_attributes(registered, attribs);
+	zend_constant_add_attributes(registered, attributes);
 
 	FREE_OP1();
 	FREE_OP2();