Fixes from tests

Author: DanielEScherzer

Zend/Optimizer/zend_optimizer.c

@@ -30,6 +30,7 @@
 #include "zend_call_graph.h"
 #include "zend_inference.h"
 #include "zend_dump.h"
+#include "zend_class_alias.h"
 #include "php.h"
 
 #ifndef ZEND_OPTIMIZER_MAX_REGISTERED_PASSES
@@ -773,7 +774,8 @@ void zend_optimizer_shift_jump(zend_op_array *op_array, zend_op *opline, uint32_
 
 static bool zend_optimizer_ignore_class(zval *ce_zv, zend_string *filename)
 {
-	zend_class_entry *ce = Z_PTR_P(ce_zv);
+	zend_class_entry *ce;
+	Z_CE_FROM_ZVAL_P(ce, ce_zv);
 
 	if (ce->ce_flags & ZEND_ACC_PRELOADED) {
 		Bucket *ce_bucket = (Bucket*)((uintptr_t)ce_zv - XtOffsetOf(Bucket, val));
@@ -809,14 +811,22 @@ static bool zend_optimizer_ignore_function(zval *fbc_zv, zend_string *filename)
 
 zend_class_entry *zend_optimizer_get_class_entry(
 		const zend_script *script, const zend_op_array *op_array, zend_string *lcname) {
-	zend_class_entry *ce = script ? zend_hash_find_ptr(&script->class_table, lcname) : NULL;
-	if (ce) {
-		return ce;
+	zval *ce_or_alias = script ? zend_hash_find(&script->class_table, lcname) : NULL;
+	if (ce_or_alias) {
+		if (EXPECTED(Z_TYPE_P(ce_or_alias) == IS_PTR)) {
+			return Z_PTR_P(ce_or_alias);
+		}
+		ZEND_ASSERT(Z_TYPE_P(ce_or_alias) == IS_ALIAS_PTR);
+		return Z_CLASS_ALIAS_P(ce_or_alias)->ce;
 	}
 
 	zval *ce_zv = zend_hash_find(CG(class_table), lcname);
 	if (ce_zv && !zend_optimizer_ignore_class(ce_zv, op_array ? op_array->filename : NULL)) {
-		return Z_PTR_P(ce_zv);
+		if (EXPECTED(Z_TYPE_P(ce_zv) == IS_PTR)) {
+			return Z_PTR_P(ce_zv);
+		}
+		ZEND_ASSERT(Z_TYPE_P(ce_zv) == IS_ALIAS_PTR);
+		return Z_CLASS_ALIAS_P(ce_zv)->ce;
 	}
 
 	if (op_array && op_array->scope && zend_string_equals_ci(op_array->scope->name, lcname)) {

ext/reflection/tests/ReflectionExtension_getClasses_basic.phpt

@@ -8,7 +8,7 @@ $ext = new ReflectionExtension('reflection');
 var_dump($ext->getClasses());
 ?>
 --EXPECTF--
-array(26) {
+array(27) {
   ["ReflectionException"]=>
   object(ReflectionClass)#%d (1) {
     ["name"]=>
@@ -139,4 +139,9 @@ array(26) {
     ["name"]=>
     string(16) "PropertyHookType"
   }
+  ["ReflectionClassAlias"]=>
+  object(ReflectionClass)#%d (1) {
+    ["name"]=>
+    string(20) "ReflectionClassAlias"
+  }
 }