Fix named parameters and opcache protection

Author: DanielEScherzer

Zend/tests/attributes/constants/allow_named_parameters.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Verify that named parameters can be passed to attributes on constants
+--FILE--
+<?php
+
+#[MyAttribute(foo: "bar")]
+const EXAMPLE = 'Foo';
+
+$ref = new ReflectionConstant('EXAMPLE');
+$attribs = $ref->getAttributes();
+var_dump( $attribs );
+var_dump( $attribs[0]->getArguments() );
+
+?>
+--EXPECTF--
+array(1) {
+  [0]=>
+  object(ReflectionAttribute)#2 (1) {
+    ["name"]=>
+    string(11) "MyAttribute"
+  }
+}
+array(1) {
+  ["foo"]=>
+  string(3) "bar"
+}

Zend/zend_attributes.c

@@ -251,11 +251,24 @@ 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) {
-		if (SUCCESS != zval_update_constant_ex(ret, scope)) {
-			zval_ptr_dtor(ret);
-			return FAILURE;
-		}
+	if (Z_TYPE_P(ret) != IS_CONSTANT_AST) {
+		return SUCCESS;
+	}
+	zend_ast *arg_ast = Z_ASTVAL_P(ret);
+	zend_result result;
+	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);
+		result = zval_update_constant_ex(ret, scope);
+	} else {
+		result = zval_update_constant_ex(ret, scope);
+	}
+	if (result != SUCCESS) {
+		zval_ptr_dtor(ret);
+		return FAILURE;
 	}
 
 	return SUCCESS;

Zend/zend_compile.c

@@ -7425,8 +7425,20 @@ void zend_compile_attributes(
 							"Cannot use positional argument after named argument");
 					}
 
-					zend_const_expr_to_zval(
-						&attr->args[j].value, arg_ast_ptr, /* allow_dynamic */ true);
+					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);
+						zend_ast_ref_destroy(ast_copy_ref);
+					} else {
+						zend_const_expr_to_zval(
+							&attr->args[j].value, arg_ast_ptr, /* allow_dynamic */ true);
+					}
 				}
 			}
 		}
@@ -11336,7 +11348,8 @@ void zend_const_expr_to_zval(zval *result, zend_ast **ast_ptr, bool allow_dynami
 	if ((*ast_ptr)->kind != ZEND_AST_ZVAL) {
 		/* Replace with compiled AST zval representation. */
 		zval ast_zv;
-		ZVAL_AST(&ast_zv, zend_ast_copy(*ast_ptr));
+		zend_ast_ref *copy_ref = zend_ast_copy(*ast_ptr);
+		ZVAL_AST(&ast_zv, copy_ref);
 		zend_ast_destroy(*ast_ptr);
 		*ast_ptr = zend_ast_create_zval(&ast_zv);
 	}