diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExpectedActualDeclarationChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExpectedActualDeclarationChecker.kt index edb96772dd7..1327a58ea57 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExpectedActualDeclarationChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExpectedActualDeclarationChecker.kt @@ -117,13 +117,10 @@ object ExpectedActualDeclarationChecker : DeclarationChecker { // So yet we are using own module in compiler context and common module in IDE context. val commonOrOwnModules = descriptor.module.expectedByModules.ifEmpty { listOf(descriptor.module) } val compatibility = commonOrOwnModules - .asSequence() - .fold(LinkedHashMap>()) { resultMap, commonModule -> - val currentMap = ExpectedActualResolver.findExpectedForActual(descriptor, commonModule) - if (currentMap != null) { - resultMap.putAll(currentMap) - } - resultMap + .mapNotNull { ExpectedActualResolver.findExpectedForActual(descriptor, it) } + .ifEmpty { return } + .fold(LinkedHashMap>()) { resultMap, partialMap -> + resultMap.apply { putAll(partialMap) } } val hasActualModifier = descriptor.isActual && reportOn.hasActualModifier()