Try

Author: DanielEScherzer

Zend/Optimizer/zend_optimizer.c

@@ -779,6 +779,9 @@ static bool zend_optimizer_ignore_class(zval *ce_zv, const zend_string *filename
 {
 	const zend_class_entry *ce;
 	Z_CE_FROM_ZVAL_P(ce, ce_zv);
+	if (Z_TYPE_P(ce_zv) == IS_ALIAS_PTR) {
+		return true;
+	}
 
 	if (ce->ce_flags & ZEND_ACC_PRELOADED) {
 		const Bucket *ce_bucket = (const Bucket*)((uintptr_t)ce_zv - XtOffsetOf(Bucket, val));
@@ -833,7 +836,8 @@ zend_class_entry *zend_optimizer_get_class_entry(
 			// up at runtime
 			return NULL;
 		}
-		return Z_CLASS_ALIAS_P(ce_or_alias)->ce;
+		return NULL;
+		// return Z_CLASS_ALIAS_P(ce_or_alias)->ce;
 	}
 
 	zval *ce_zv = zend_hash_find(CG(class_table), lcname);
@@ -842,7 +846,8 @@ zend_class_entry *zend_optimizer_get_class_entry(
 			return Z_PTR_P(ce_zv);
 		}
 		ZEND_ASSERT(Z_TYPE_P(ce_zv) == IS_ALIAS_PTR);
-		return Z_CLASS_ALIAS_P(ce_zv)->ce;
+		return NULL;
+		// return Z_CLASS_ALIAS_P(ce_zv)->ce;
 	}
 
 	if (op_array && op_array->scope && zend_string_equals_ci(op_array->scope->name, lcname)) {
@@ -885,7 +890,7 @@ const zend_class_constant *zend_fetch_class_const_info(
 			} else {
 				zval *ce_zv = zend_hash_find(EG(class_table), Z_STR_P(op1 + 1));
 				if (ce_zv && !zend_optimizer_ignore_class(ce_zv, op_array->filename)) {
-					ce = Z_PTR_P(ce_zv);
+					Z_CE_FROM_ZVAL_P(ce, ce_zv);
 				}
 			}
 		}

Zend/tests/attributes/class_alias/attributes_dict.phpt

@@ -6,6 +6,8 @@ Alias attributes must not be associative
 #[ClassAlias('Other', ['test' => new Deprecated()])]
 class Demo {}
 
+class_alias( 'Demo', 'Other2' );
+
 $attr = new ReflectionClass( Demo::class )->getAttributes()[0];
 $attr->newInstance();
 

Zend/zend_API.c

@@ -3613,6 +3613,7 @@ ZEND_API zend_result zend_register_class_alias_ex(const char *name, size_t name_
 	}
 
 	zend_string_release(original_name);
+	free(alias);
 	return FAILURE;
 }
 /* }}} */

Zend/zend_attributes.c

@@ -337,6 +337,11 @@ static void validate_class_alias(
 		goto restore_execution_data;
 	}
 
+	// if (CG(compiler_options) & ZEND_COMPILE_NO_CONSTANT_SUBSTITUTION) {
+	// 	// Opcache, don't register the alias
+	// 	goto restore_execution_data;
+	// }
+
 	zend_result result = zend_register_class_alias_ex(
 		ZSTR_VAL(alias),
 		ZSTR_LEN(alias),
@@ -660,10 +665,6 @@ ZEND_API zend_result zend_get_attribute_value(zval *ret, const zend_attribute *a
 	ZVAL_COPY_OR_DUP(ret, &attr->args[i].value);
 
 	if (Z_TYPE_P(ret) == IS_CONSTANT_AST) {
-		// Delayed validation for attributes in class aliases
-		if (CG(in_compilation) && i == 1 && zend_string_equals(attr->name, zend_ce_class_alias->name)) {
-			return SUCCESS;
-		}
 		if (SUCCESS != zval_update_constant_ex(ret, scope)) {
 			zval_ptr_dtor(ret);
 			return FAILURE;

Zend/zend_execute_API.c

@@ -328,9 +328,10 @@ ZEND_API void zend_shutdown_executor_values(bool fast_shutdown)
 			}
 		} ZEND_HASH_FOREACH_END();
 		ZEND_HASH_MAP_REVERSE_FOREACH_VAL(EG(class_table), zv) {
-			if (Z_TYPE_P(zv) == IS_ALIAS_PTR) {
-				continue;
-			}
+			// CHECK
+			// if (Z_TYPE_P(zv) == IS_ALIAS_PTR) {
+			// 	continue;
+			// }
 			zend_class_entry *ce;
 			Z_CE_FROM_ZVAL_P(ce, zv);
 

Zend/zend_opcode.c

@@ -300,6 +300,10 @@ ZEND_API void destroy_zend_class(zval *zv)
 	if (UNEXPECTED(Z_TYPE_INFO_P(zv) == IS_ALIAS_PTR)) {
 		zend_class_alias *class_alias = Z_CLASS_ALIAS_P(zv);
 
+		if (class_alias->alias_flags & ZEND_ACC_IMMUTABLE) {
+			return;
+		}
+
 		if (class_alias->attributes) {
 			zend_hash_release(class_alias->attributes);
 			// class_alias->attributes = NULL;

ext/opcache/ZendAccelerator.c

@@ -682,9 +682,16 @@ static void accel_copy_permanent_strings(zend_new_interned_string_func_t new_int
 
 	/* class table hash keys, class names, properties, methods, constants, etc */
 	ZEND_HASH_MAP_FOREACH_BUCKET(CG(class_table), p) {
-		zend_class_entry *ce;
+		zend_class_entry *ce = NULL;
 
-		Z_CE_FROM_ZVAL(ce, p->val);
+		if (EXPECTED(Z_TYPE(p->val) == IS_PTR)) {
+			ce = Z_PTR(p->val);
+		} else {
+			ZEND_ASSERT(Z_TYPE(p->val) == IS_ALIAS_PTR);
+			zend_class_alias *alias = Z_PTR(p->val);
+			alias->name = new_interned_string(alias->name);
+			ce = alias->ce;
+		}
 
 		if (p->key) {
 			p->key = new_interned_string(p->key);
@@ -4119,8 +4126,6 @@ static void preload_link(void)
 						zend_hash_index_del(
 							CG(delayed_variance_obligations), (uintptr_t) Z_CE_P(zv));
 					}
-					zend_hash_index_del(
-						CG(delayed_variance_obligations), (uintptr_t) Z_CE_P(zv));
 				}
 
 				/* Restore the original class. */

ext/opcache/zend_file_cache.c

@@ -1664,6 +1664,7 @@ static void zend_file_cache_unserialize_class(zval                    *zv,
                                               zend_persistent_script  *script,
                                               void                    *buf)
 {
+	ZEND_ASSERT(Z_TYPE_P(zv) == IS_PTR);
 	zend_class_entry *ce;
 
 	UNSERIALIZE_PTR(Z_PTR_P(zv));

ext/opcache/zend_persist.c

@@ -924,6 +924,12 @@ zend_class_alias *zend_persist_class_alias_entry(zend_class_alias *orig_alias)
 		alias->attributes = zend_persist_attributes(alias->attributes);
 	}
 
+	if (EXPECTED(!ZCG(current_persistent_script)->corrupted)) {
+		alias->alias_flags |= ZEND_ACC_IMMUTABLE;
+	} else {
+		alias->alias_flags |= ZEND_ACC_FILE_CACHED;
+	}
+
 	return alias;
 }