Revert attributes/name/etc.

Just switching to a zend_class_alias object should be easier

Author: DanielEScherzer

Zend/Optimizer/zend_optimizer.c

@@ -776,9 +776,6 @@ static bool zend_optimizer_ignore_class(zval *ce_zv, zend_string *filename)
 {
 	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) {
 		Bucket *ce_bucket = (Bucket*)((uintptr_t)ce_zv - XtOffsetOf(Bucket, val));
@@ -787,13 +784,6 @@ static bool zend_optimizer_ignore_class(zval *ce_zv, zend_string *filename)
 			return false;
 		}
 	}
-	// Ignore deprecated aliases so that they are fetched at runtime
-	if (Z_TYPE_P(ce_zv) == IS_ALIAS_PTR) {
-		zend_class_alias *alias = Z_CLASS_ALIAS_P(ce_zv);
-		if (alias->alias_flags & ZEND_ACC_DEPRECATED) {
-			return true;
-		}
-	}
 	return ce->type == ZEND_USER_CLASS
 		&& (!ce->info.user.filename || ce->info.user.filename != filename);
 }
@@ -827,14 +817,7 @@ zend_class_entry *zend_optimizer_get_class_entry(
 			return Z_PTR_P(ce_or_alias);
 		}
 		ZEND_ASSERT(Z_TYPE_P(ce_or_alias) == IS_ALIAS_PTR);
-		zend_class_alias *alias = Z_CLASS_ALIAS_P(ce_or_alias);
-		if (alias->alias_flags & ZEND_ACC_DEPRECATED) {
-			// Pretend that the class cannot be found so that it gets looked
-			// up at runtime
-			return NULL;
-		}
-		return NULL;
-		// return Z_CLASS_ALIAS_P(ce_or_alias)->ce;
+		return Z_CLASS_ALIAS_P(ce_or_alias)->ce;
 	}
 
 	zval *ce_zv = zend_hash_find(CG(class_table), lcname);
@@ -843,8 +826,7 @@ 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 NULL;
-		// return Z_CLASS_ALIAS_P(ce_zv)->ce;
+		return Z_CLASS_ALIAS_P(ce_zv)->ce;
 	}
 
 	if (op_array && op_array->scope && zend_string_equals_ci(op_array->scope->name, lcname)) {

Zend/tests/attributes/034_target_values.phpt

@@ -16,26 +16,24 @@ showFlag("TARGET_PROPERTY", Attribute::TARGET_PROPERTY);
 showFlag("TARGET_CLASS_CONSTANT", Attribute::TARGET_CLASS_CONSTANT);
 showFlag("TARGET_PARAMETER", Attribute::TARGET_PARAMETER);
 showFlag("TARGET_CONSTANT", Attribute::TARGET_CONSTANT);
-showFlag("TARGET_CLASS_ALIAS", Attribute::TARGET_CLASS_ALIAS);
 showFlag("IS_REPEATABLE", Attribute::IS_REPEATABLE);
 
 $all = Attribute::TARGET_CLASS | Attribute::TARGET_FUNCTION
     | Attribute::TARGET_METHOD | Attribute::TARGET_PROPERTY
     | Attribute::TARGET_CLASS_CONSTANT | Attribute::TARGET_PARAMETER
-    | Attribute::TARGET_CONSTANT | Attribute::TARGET_CLASS_ALIAS;
+    | Attribute::TARGET_CONSTANT;
 var_dump($all, Attribute::TARGET_ALL, $all === Attribute::TARGET_ALL);
 
 ?>
 --EXPECT--
-Attribute::TARGET_CLASS = 1 (255 & 1 === 1)
-Attribute::TARGET_FUNCTION = 2 (255 & 2 === 2)
-Attribute::TARGET_METHOD = 4 (255 & 4 === 4)
-Attribute::TARGET_PROPERTY = 8 (255 & 8 === 8)
-Attribute::TARGET_CLASS_CONSTANT = 16 (255 & 16 === 16)
-Attribute::TARGET_PARAMETER = 32 (255 & 32 === 32)
-Attribute::TARGET_CONSTANT = 64 (255 & 64 === 64)
-Attribute::TARGET_CLASS_ALIAS = 128 (255 & 128 === 128)
-Attribute::IS_REPEATABLE = 256 (255 & 256 === 0)
-int(255)
-int(255)
+Attribute::TARGET_CLASS = 1 (127 & 1 === 1)
+Attribute::TARGET_FUNCTION = 2 (127 & 2 === 2)
+Attribute::TARGET_METHOD = 4 (127 & 4 === 4)
+Attribute::TARGET_PROPERTY = 8 (127 & 8 === 8)
+Attribute::TARGET_CLASS_CONSTANT = 16 (127 & 16 === 16)
+Attribute::TARGET_PARAMETER = 32 (127 & 32 === 32)
+Attribute::TARGET_CONSTANT = 64 (127 & 64 === 64)
+Attribute::IS_REPEATABLE = 128 (127 & 128 === 0)
+int(127)
+int(127)
 bool(true)