Add zend_constant_add_attributes() helper

Author: DanielEScherzer

Zend/zend_constants.c

@@ -18,6 +18,7 @@
 */
 
 #include "zend.h"
+#include "zend_attributes.h"
 #include "zend_constants.h"
 #include "zend_exceptions.h"
 #include "zend_execute.h"
@@ -544,3 +545,21 @@ 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);
+	zend_compile_attributes(&c->attributes, ast, 0, ZEND_ATTRIBUTE_TARGET_CONST, 0);
+	zend_attribute *deprecated_attribute = zend_get_attribute_str(
+		c->attributes,
+		"deprecated",
+		sizeof("deprecated")-1
+	);
+
+	if (deprecated_attribute) {
+		ZEND_CONSTANT_SET_FLAGS(
+			c,
+			ZEND_CONSTANT_FLAGS(c) | CONST_DEPRECATED,
+			ZEND_CONSTANT_MODULE_NUMBER(c)
+		);
+	}
+}

Zend/zend_constants.h

@@ -87,6 +87,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);
 #ifdef ZTS
 void zend_copy_constants(HashTable *target, HashTable *source);
 #endif

Zend/zend_vm_def.h

@@ -8280,21 +8280,7 @@ ZEND_VM_HANDLER(210, ZEND_DECLARE_ATTRIBUTED_CONST, CONST, CONST)
 	zval *attribs = GET_OP_DATA_ZVAL_PTR(BP_VAR_R);
 	zend_constant *registered = zend_get_constant_ptr(c.name);
 	ZEND_ASSERT(registered != NULL);
-	zend_ast *ast = Z_ASTVAL_P(attribs);
-	zend_compile_attributes(&registered->attributes, ast, 0, ZEND_ATTRIBUTE_TARGET_CONST, 0);
-	zend_attribute *deprecated_attribute = zend_get_attribute_str(
-		registered->attributes,
-		"deprecated",
-		sizeof("deprecated")-1
-	);
-
-	if (deprecated_attribute) {
-		ZEND_CONSTANT_SET_FLAGS(
-			registered,
-			ZEND_CONSTANT_FLAGS(registered) | CONST_DEPRECATED,
-			ZEND_CONSTANT_MODULE_NUMBER(registered)
-		);
-	}
+	zend_constant_add_attributes(registered, attribs);
 
 	FREE_OP1();
 	FREE_OP2();