More tests, cleanup, fix bug around constants being redefined

Author: DanielEScherzer

Zend/tests/attributes/constants/constant_redefined_addition.phpt

@@ -0,0 +1,21 @@
+--TEST--
+If a constant is redefined, attributes remain unchanged (no attributes)
+--FILE--
+<?php
+
+const MY_CONST = "No attributes";
+
+#[\MyAttribute]
+const MY_CONST = "Has attributes";
+
+echo MY_CONST . "\n";
+
+$reflection = new ReflectionConstant( 'MY_CONST' );
+var_dump( $reflection->getAttributes() )
+
+?>
+--EXPECTF--
+Warning: Constant MY_CONST already defined in %s on line %d
+No attributes
+array(0) {
+}

Zend/tests/attributes/constants/constant_redefined_change.phpt

@@ -0,0 +1,27 @@
+--TEST--
+If a constant is redefined, attributes remain unchanged (attributes change)
+--FILE--
+<?php
+
+#[\MyAttribute]
+const MY_CONST = "Has attributes (1)";
+
+#[\MyOtherAttribute]
+const MY_CONST = "Has attributes (2)";
+
+echo MY_CONST . "\n";
+
+$reflection = new ReflectionConstant( 'MY_CONST' );
+var_dump( $reflection->getAttributes() )
+
+?>
+--EXPECTF--
+Warning: Constant MY_CONST already defined in %s on line %d
+Has attributes (1)
+array(1) {
+  [0]=>
+  object(ReflectionAttribute)#%d (1) {
+    ["name"]=>
+    string(11) "MyAttribute"
+  }
+}

Zend/tests/attributes/constants/constant_redefined_removal.phpt

@@ -0,0 +1,26 @@
+--TEST--
+If a constant is redefined, attributes remain unchanged (had attributes)
+--FILE--
+<?php
+
+#[\MyAttribute]
+const MY_CONST = "Has attributes";
+
+const MY_CONST = "No attributes";
+
+echo MY_CONST . "\n";
+
+$reflection = new ReflectionConstant( 'MY_CONST' );
+var_dump( $reflection->getAttributes() )
+
+?>
+--EXPECTF--
+Warning: Constant MY_CONST already defined in %s on line %d
+Has attributes
+array(1) {
+  [0]=>
+  object(ReflectionAttribute)#%d (1) {
+    ["name"]=>
+    string(11) "MyAttribute"
+  }
+}

Zend/tests/attributes/constants/must_target_const-internal.phpt

@@ -0,0 +1,11 @@
+--TEST--
+Error when attribute does not target constants (internal attribute)
+--FILE--
+<?php
+
+#[Attribute]
+const EXAMPLE = 'Foo';
+
+?>
+--EXPECTF--
+Fatal error: Attribute "Attribute" cannot target constant (allowed targets: class) in %s on line %d

Zend/tests/attributes/constants/must_target_const.phpt renamed to Zend/tests/attributes/constants/must_target_const-userland.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Error when attribute does not target constants
+Error when attribute does not target constants (useland attribute)
 --FILE--
 <?php
 

Zend/tests/attributes/constants/named_parameter_validation.phpt

@@ -0,0 +1,14 @@
+--TEST--
+Verify processing of named arguments
+--DESCRIPTION--
+Since attributes on constants do not have arguments checked until runtime,
+check that the validation logic still works
+--FILE--
+<?php
+
+#[MyAttribute(foo: "bar", foo: "baz")]
+const EXAMPLE = 'Foo';
+
+?>
+--EXPECTF--
+Fatal error: Duplicate named parameter $foo in %s on line %d

Zend/zend_compile.c

@@ -11348,8 +11348,7 @@ 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;
-		zend_ast_ref *copy_ref = zend_ast_copy(*ast_ptr);
-		ZVAL_AST(&ast_zv, copy_ref);
+		ZVAL_AST(&ast_zv, zend_ast_copy(*ast_ptr));
 		zend_ast_destroy(*ast_ptr);
 		*ast_ptr = zend_ast_create_zval(&ast_zv);
 	}

Zend/zend_vm_def.h

@@ -8275,6 +8275,10 @@ ZEND_VM_HANDLER(210, ZEND_DECLARE_ATTRIBUTED_CONST, CONST, CONST)
 	c.name = zend_string_copy(Z_STR_P(name));
 
 	if (zend_register_constant(&c) == FAILURE) {
+		FREE_OP1();
+		FREE_OP2();
+		/* two opcodes used, second one is the data with attributes */
+		ZEND_VM_NEXT_OPCODE_EX(1, 2);
 	}
 
 	zval *attribs = GET_OP_DATA_ZVAL_PTR(BP_VAR_R);