Fix another indirect recursive case

Author: iluuu1994

Zend/tests/attributes/deprecated/class_constants/gh17711.phpt

@@ -3,16 +3,26 @@ GH-17711: Infinite recursion through deprecated class constants self-referencing
 --FILE--
 <?php
 
-const TEST = 'Message';
-
 class C {
     #[\Deprecated(self::C)]
     const C = TEST;
 }
 
+const TEST = 'Message';
 var_dump(C::C);
 
+class D {
+    #[\Deprecated(Alias::C)]
+    const C = 'test';
+}
+
+class_alias('D', 'Alias');
+var_dump(D::C);
+
 ?>
 --EXPECTF--
 Deprecated: Constant C::C is deprecated, Message in %s on line %d
 string(7) "Message"
+
+Deprecated: Constant D::C is deprecated, test in %s on line %d
+string(4) "test"

Zend/zend_API.c

@@ -1439,7 +1439,7 @@ ZEND_API HashTable *zend_separate_class_constants_table(zend_class_entry *class_
 
 	ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(&class_type->constants_table, key, c) {
 		if (c->ce == class_type) {
-			if (Z_TYPE(c->value) == IS_CONSTANT_AST) {
+			if (Z_TYPE(c->value) == IS_CONSTANT_AST || (ZEND_CLASS_CONST_FLAGS(c) & ZEND_ACC_DEPRECATED)) {
 				new_c = zend_arena_alloc(&CG(arena), sizeof(zend_class_constant));
 				memcpy(new_c, c, sizeof(zend_class_constant));
 				c = new_c;

Zend/zend_compile.c

@@ -8822,6 +8822,10 @@ static void zend_compile_class_const_decl(zend_ast *ast, uint32_t flags, zend_as
 
 			if (deprecated) {
 				ZEND_CLASS_CONST_FLAGS(c) |= ZEND_ACC_DEPRECATED;
+				/* For deprecated constants, we need to flag the zval for recursion
+				 * detection. Make sure the zval is separated out of shm. */
+				ce->ce_flags |= ZEND_ACC_HAS_AST_CONSTANTS;
+				ce->ce_flags &= ~ZEND_ACC_CONSTANTS_UPDATED;
 			}
 		}
 	}

Zend/zend_constants.h

@@ -32,15 +32,11 @@
 #define CONST_IS_RECURSIVE(c) (Z_CONSTANT_FLAGS((c)->value) & CONST_RECURSIVE)
 #define CONST_PROTECT_RECURSION(c) \
 	do { \
-		if (Z_TYPE((c)->value) == IS_CONSTANT_AST) { \
-			Z_CONSTANT_FLAGS((c)->value) |= CONST_RECURSIVE; \
-		} \
+		Z_CONSTANT_FLAGS((c)->value) |= CONST_RECURSIVE; \
 	} while (0)
 #define CONST_UNPROTECT_RECURSION(c) \
 	do { \
-		if (Z_TYPE((c)->value) == IS_CONSTANT_AST) { \
-			Z_CONSTANT_FLAGS((c)->value) &= ~CONST_RECURSIVE; \
-		} \
+		Z_CONSTANT_FLAGS((c)->value) &= ~CONST_RECURSIVE; \
 	} while (0)
 
 #define	PHP_USER_CONSTANT   0x7fffff /* a constant defined in user space */