From 26ff806440bcd7ab240ae61c357f92e368706137 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 7 Dec 2022 13:27:12 +0100 Subject: [PATCH] EmptyIntersectionTypeChecker: don't take stub & error types into account This commit fixes some tests broken by previous refactorings --- .../kotlin/resolve/checkers/EmptyIntersectionTypeChecker.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/compiler.common/src/org/jetbrains/kotlin/resolve/checkers/EmptyIntersectionTypeChecker.kt b/core/compiler.common/src/org/jetbrains/kotlin/resolve/checkers/EmptyIntersectionTypeChecker.kt index a79160f0ec9..6c7619e3649 100644 --- a/core/compiler.common/src/org/jetbrains/kotlin/resolve/checkers/EmptyIntersectionTypeChecker.kt +++ b/core/compiler.common/src/org/jetbrains/kotlin/resolve/checkers/EmptyIntersectionTypeChecker.kt @@ -109,6 +109,10 @@ internal object EmptyIntersectionTypeChecker { ).isNotEmpty() private fun TypeSystemInferenceExtensionContext.mayCauseEmptyIntersection(type: KotlinTypeMarker): Boolean { + if (type.lowerBoundIfFlexible().isStubType() || type.isError()) { + return false + } + val typeConstructor = type.typeConstructor() if (!typeConstructor.isClassTypeConstructor() && !typeConstructor.isTypeParameterTypeConstructor())