Fix for opcache

Delay compiling the attributes until runtime

Author: DanielEScherzer

Zend/zend_compile.c

@@ -7344,7 +7344,7 @@ static bool zend_is_valid_default_value(zend_type type, zval *value)
 	return 0;
 }
 
-static void zend_compile_attributes(
+void zend_compile_attributes(
 	HashTable **attributes, zend_ast *ast, uint32_t offset, uint32_t target, uint32_t promoted
 ) /* {{{ */ {
 	zend_attribute *attr;
@@ -7386,8 +7386,10 @@ static void zend_compile_attributes(
 				}
 			}
 
-			uint32_t flags = (CG(active_op_array)->fn_flags & ZEND_ACC_STRICT_TYPES)
-				? ZEND_ATTRIBUTE_STRICT_TYPES : 0;
+			uint32_t flags = 0;
+			if (CG(active_op_array) && (CG(active_op_array)->fn_flags & ZEND_ACC_STRICT_TYPES)) {
+				flags = ZEND_ATTRIBUTE_STRICT_TYPES;
+			}
 			attr = zend_add_attribute(
 				attributes, name, args ? args->children : 0, flags, offset, el->lineno);
 			zend_string_release(name);
@@ -9471,11 +9473,9 @@ static void zend_compile_const_decl(zend_ast *ast) /* {{{ */
 	}
 	ZEND_ASSERT(last_op != NULL);
 	last_op->opcode = ZEND_DECLARE_ATTRIBUTED_CONST;
-	HashTable *attribs_ht = NULL;
-	zend_compile_attributes(&attribs_ht, list->child[1], 0, ZEND_ATTRIBUTE_TARGET_CONST, 0);
 	znode attribs_node;
 	attribs_node.op_type = IS_CONST;
-	ZVAL_PTR(&attribs_node.u.constant, attribs_ht);
+	ZVAL_AST(&attribs_node.u.constant, zend_ast_copy(list->child[1]));
 	zend_emit_op_data(&attribs_node);
 }
 /* }}}*/

Zend/zend_compile.h

@@ -1006,6 +1006,10 @@ void zend_assert_valid_class_name(const zend_string *const_name, const char *typ
 zend_string *zend_type_to_string_resolved(zend_type type, zend_class_entry *scope);
 ZEND_API zend_string *zend_type_to_string(zend_type type);
 
+void zend_compile_attributes(
+	HashTable **attributes, zend_ast *ast, uint32_t offset, uint32_t target, uint32_t promoted
+);
+
 /* BEGIN: OPCODES */
 
 #include "zend_vm_opcodes.h"

Zend/zend_vm_def.h

@@ -8280,9 +8280,10 @@ 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);
-	registered->attributes = Z_PTR_P(attribs);
+	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(
-		Z_PTR_P(attribs),
+		registered->attributes,
 		"deprecated",
 		sizeof("deprecated")-1
 	);