Fix merge

Author: nikic

Zend/zend_inheritance.c

@@ -342,22 +342,16 @@ static zend_bool zend_type_permits_self(
 	/* Any types that may satisfy self must have already been loaded at this point
 	 * (as a parent or interface), so we never need to register delayed variance obligations
 	 * for this case. */
-	if (ZEND_TYPE_HAS_LIST(type)) {
-		void *entry;
-		ZEND_TYPE_LIST_FOREACH(ZEND_TYPE_LIST(type), entry) {
-		zend_string *name = resolve_class_name(scope, ZEND_TYPE_LIST_GET_NAME(entry));
+	zend_type *single_type;
+	ZEND_TYPE_FOREACH(type, single_type) {
+		if (ZEND_TYPE_HAS_NAME(*single_type)) {
+			zend_string *name = resolve_class_name(scope, ZEND_TYPE_NAME(*single_type));
 			zend_class_entry *ce = lookup_class(self, name, /* register_unresolved */ 0);
 			if (ce && unlinked_instanceof(self, ce)) {
 				return 1;
 			}
-		} ZEND_TYPE_LIST_FOREACH_END();
-		return 0;
-	}
-	if (ZEND_TYPE_HAS_NAME(type)) {
-		zend_string *name = resolve_class_name(scope, ZEND_TYPE_NAME(type));
-		zend_class_entry *ce = lookup_class(self, name, /* register_unresolved */ 0);
-		return ce && unlinked_instanceof(self, ce);
-	}
+		}
+	} ZEND_TYPE_FOREACH_END();
 	return 0;
 }
 

ext/opcache/jit/zend_jit_helpers.c

@@ -1191,7 +1191,7 @@ static zend_always_inline zend_bool zend_jit_verify_type_common(zval *arg, const
 		return 1;
 	}
 	if ((type_mask & MAY_BE_STATIC) && zend_value_instanceof_static(arg)) {
-		return;
+		return 1;
 	}
 	if (zend_verify_scalar_type_hint(type_mask, arg, ZEND_ARG_USES_STRICT_TYPES(), /* is_internal */ 0)) {
 		return 1;