Revert "Force recompile all call-sites of ExpectedActualResolver.{findActualForExpected, findExpectedForActual}"

This reverts commit 529a1dd720.

This commit was needed to workaround broken incremental compilation in
JPS in Kotlin plugin. The incremental compilation bug is reported
KT-60759

As promised in 529a1dd720, after a few
days in `master` I revert it

Review: https://jetbrains.team/p/kt/reviews/11724/timeline
This commit is contained in:
Nikita Bobko
2023-08-21 11:30:23 +02:00
committed by Space Team
parent 04d01e381f
commit 830084a678
3 changed files with 7 additions and 8 deletions
@@ -270,7 +270,7 @@ class ExpectedActualDeclarationChecker(
compatibility: Map<ExpectActualCompatibility<MemberDescriptor>, List<MemberDescriptor>>
): Boolean {
return compatibility.values.flatMapTo(hashSetOf()) { it }.all { actual ->
val expectedOnes = ExpectedActualResolver.findExpectedForActual_incrementalCompilationWorkaround(actual, onlyFromThisModule(module))
val expectedOnes = ExpectedActualResolver.findExpectedForActual(actual, onlyFromThisModule(module))
expectedOnes != null && Compatible in expectedOnes.keys
}
}
@@ -298,7 +298,7 @@ class ExpectedActualDeclarationChecker(
moduleVisibilityFilter: ModuleFilter
) {
val compatibility = ExpectedActualResolver
.findExpectedForActual_incrementalCompilationWorkaround(descriptor, moduleVisibilityFilter, shouldCheckAbsenceOfDefaultParamsInActual = true)
.findExpectedForActual(descriptor, moduleVisibilityFilter, shouldCheckAbsenceOfDefaultParamsInActual = true)
?: return
checkAmbiguousExpects(compatibility, trace, reportOn, descriptor)
@@ -337,7 +337,7 @@ class ExpectedActualDeclarationChecker(
return actualMember != null &&
actualMember.isExplicitActualDeclaration() &&
!incompatibility.allStrongIncompatibilities() &&
ExpectedActualResolver.findExpectedForActual_incrementalCompilationWorkaround(
ExpectedActualResolver.findExpectedForActual(
actualMember, onlyFromThisModule(expectedMember.module)
)?.values?.singleOrNull()?.singleOrNull() == expectedMember
}