Support resolving arg/return intersection types in the JIT

Author: Girgias

ext/opcache/jit/zend_jit_helpers.c

@@ -1345,29 +1345,58 @@ static zend_always_inline bool zend_jit_verify_type_common(zval *arg, zend_arg_i
 		zend_class_entry *ce;
 		if (ZEND_TYPE_HAS_LIST(arg_info->type)) {
 			zend_type *list_type;
-			ZEND_TYPE_LIST_FOREACH(ZEND_TYPE_LIST(arg_info->type), list_type) {
-				if (*cache_slot) {
-					ce = *cache_slot;
-				} else if (ZEND_TYPE_HAS_CE_CACHE(*list_type) && ZEND_TYPE_CE_CACHE(*list_type)) {
-					ce = ZEND_TYPE_CE_CACHE(*list_type);
-					*cache_slot = ce;
-				} else {
-					ce = zend_fetch_class(ZEND_TYPE_NAME(*list_type),
-						ZEND_FETCH_CLASS_AUTO | ZEND_FETCH_CLASS_NO_AUTOLOAD | ZEND_FETCH_CLASS_SILENT);
-					if (!ce) {
-						cache_slot++;
-						continue;
+			if (ZEND_TYPE_HAS_INTERSECTION(arg_info->type)) {
+				ZEND_TYPE_LIST_FOREACH(ZEND_TYPE_LIST(arg_info->type), list_type) {
+					/* Fetch class_entry */
+					if (*cache_slot) {
+						ce = *cache_slot;
+					} else if (ZEND_TYPE_HAS_CE_CACHE(*list_type) && ZEND_TYPE_CE_CACHE(*list_type)) {
+						ce = ZEND_TYPE_CE_CACHE(*list_type);
+						*cache_slot = ce;
+					} else {
+						ce = zend_fetch_class(ZEND_TYPE_NAME(*list_type),
+							ZEND_FETCH_CLASS_AUTO | ZEND_FETCH_CLASS_NO_AUTOLOAD | ZEND_FETCH_CLASS_SILENT);
+						if (!ce) {
+							/* Cannot resolve */
+							return false;
+						}
+						*cache_slot = ce;
+						if (ZEND_TYPE_HAS_CE_CACHE(*list_type)) {
+							ZEND_TYPE_SET_CE_CACHE(*list_type, ce);
+						}
 					}
-					*cache_slot = ce;
-					if (ZEND_TYPE_HAS_CE_CACHE(*list_type)) {
-						ZEND_TYPE_SET_CE_CACHE(*list_type, ce);
+
+					if (!instanceof_function(Z_OBJCE_P(arg), ce)) {
+						return false;
 					}
-				}
-				if (instanceof_function(Z_OBJCE_P(arg), ce)) {
-					return 1;
-				}
-				cache_slot++;
-			} ZEND_TYPE_LIST_FOREACH_END();
+					cache_slot++;
+				} ZEND_TYPE_LIST_FOREACH_END();
+				return true;
+			} else {
+				ZEND_TYPE_LIST_FOREACH(ZEND_TYPE_LIST(arg_info->type), list_type) {
+					if (*cache_slot) {
+						ce = *cache_slot;
+					} else if (ZEND_TYPE_HAS_CE_CACHE(*list_type) && ZEND_TYPE_CE_CACHE(*list_type)) {
+						ce = ZEND_TYPE_CE_CACHE(*list_type);
+						*cache_slot = ce;
+					} else {
+						ce = zend_fetch_class(ZEND_TYPE_NAME(*list_type),
+							ZEND_FETCH_CLASS_AUTO | ZEND_FETCH_CLASS_NO_AUTOLOAD | ZEND_FETCH_CLASS_SILENT);
+						if (!ce) {
+							cache_slot++;
+							continue;
+						}
+						*cache_slot = ce;
+						if (ZEND_TYPE_HAS_CE_CACHE(*list_type)) {
+							ZEND_TYPE_SET_CE_CACHE(*list_type, ce);
+						}
+					}
+					if (instanceof_function(Z_OBJCE_P(arg), ce)) {
+						return 1;
+					}
+					cache_slot++;
+				} ZEND_TYPE_LIST_FOREACH_END();
+			}
 		} else {
 			if (EXPECTED(*cache_slot)) {
 				ce = (zend_class_entry *) *cache_slot;