Progress on finding where the issues are?

Author: Girgias

Zend/tests/type_declarations/composite_types/intersection_and_union_type_combined.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Basic tests for a complex type with an intersection type and union
+Test for a complex type with an intersection type and union of a simple type
 --FILE--
 <?php
 

Zend/tests/type_declarations/composite_types/union_of_intersection_types.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Basic tests for a complex type with an intersection type and union
+Test for a complex type with an intersection type and union with another intersection
 --FILE--
 <?php
 
@@ -12,17 +12,11 @@ class A implements X, Y {}
 class B implements W, Z {}
 class C {}
 
-function foo1(): X&Y|W&Z {
-    return new A();
+function foo1(X&Y|W&Z $v): X&Y|W&Z {
+    return $v;
 }
-function foo2(): W&Z|X&Y {
-    return new A();
-}
-function foo3(): X&Y|W&Z {
-    return new B();
-}
-function foo4(): W&Z|X&Y {
-    return new B();
+function foo2(W&Z|X&Y $v): W&Z|X&Y {
+    return $v;
 }
 
 function bar1(): X&Y|W&Z {
@@ -32,13 +26,16 @@ function bar2(): W&Z|X&Y {
     return new C();
 }
 
-$o = foo1();
+$a = new A();
+$b = new B();
+
+$o = foo1($a);
 var_dump($o);
-$o = foo2();
+$o = foo2($a);
 var_dump($o);
-$o = foo3();
+$o = foo1($b);
 var_dump($o);
-$o = foo4();
+$o = foo2($b);
 var_dump($o);
 
 try {

Zend/zend_compile.c

@@ -6283,7 +6283,7 @@ static zend_type zend_compile_typename(
 			if (type_ast->kind == ZEND_AST_TYPE_INTERSECTION) {
 				if (type_list->num_types == 0) {
 					/* The first class type can be stored directly as the type ptr payload. */
-					if (ZEND_TYPE_IS_COMPLEX(type)) {
+					if (ZEND_TYPE_HAS_NAME(type) || ZEND_TYPE_HAS_CE(type) || ZEND_TYPE_HAS_CE_CACHE(type)) {
 						/* Switch from single name to name list. */
 						type_list->num_types = 1;
 						type_list->types[0] = type;

Zend/zend_execute.c

@@ -1074,6 +1074,7 @@ static bool zend_check_intersection_type(zend_type_list *intersection_type_list,
 	return true;
 }
 
+/* TODO Need to rewind cache slot pointer? */
 static zend_always_inline bool zend_check_type_slow(
 		zend_type *type, zval *arg, zend_reference *ref, void **cache_slot, zend_class_entry *scope,
 		bool is_return_type, bool is_internal)
@@ -1087,6 +1088,7 @@ static zend_always_inline bool zend_check_type_slow(
 			/* Type is only an intersection type */
 			if (ZEND_TYPE_IS_INTERSECTION(*type)) {
 				ZEND_ASSERT(!ZEND_TYPE_IS_UNION(*type));
+				ZEND_ASSERT(Z_TYPE_P(arg) == IS_OBJECT);
 				return zend_check_intersection_type(ZEND_TYPE_LIST(*type), Z_OBJ_P(arg), cache_slot, scope);
 			}
 
@@ -1095,6 +1097,7 @@ static zend_always_inline bool zend_check_type_slow(
 			ZEND_TYPE_LIST_FOREACH(ZEND_TYPE_LIST(*type), list_type) {
 				/* Type is an intersection */
 				if (UNEXPECTED(ZEND_TYPE_IS_INTERSECTION(*list_type))) {
+					ZEND_ASSERT(Z_TYPE_P(arg) == IS_OBJECT);
 					if (zend_check_intersection_type(ZEND_TYPE_LIST(*list_type), Z_OBJ_P(arg), cache_slot, scope)) {
 						return true;
 					}

Zend/zend_language_parser.y

@@ -66,9 +66,10 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 %right T_COALESCE
 %left T_BOOLEAN_OR
 %left T_BOOLEAN_AND
+%left T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG
 %left '|'
 %left '^'
-%left T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG
+%left T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG
 %nonassoc T_IS_EQUAL T_IS_NOT_EQUAL T_IS_IDENTICAL T_IS_NOT_IDENTICAL T_SPACESHIP
 %nonassoc '<' T_IS_SMALLER_OR_EQUAL '>' T_IS_GREATER_OR_EQUAL
 %left '.'