diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirConflictsHelpers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirConflictsHelpers.kt index ca539d44947..7f64228a6d8 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirConflictsHelpers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirConflictsHelpers.kt @@ -152,7 +152,7 @@ class FirDeclarationCollector>( fun FirDeclarationCollector>.collectClassMembers(klass: FirRegularClassSymbol) { val otherDeclarations = mutableMapOf>>() - val functionDeclarations = mutableMapOf>>() + val functionDeclarations = mutableMapOf>>() val declaredMemberScope = klass.declaredMemberScope(context) val unsubstitutedScope = klass.unsubstitutedScope(context) @@ -277,10 +277,10 @@ fun collectConflictingLocalFunctionsFrom(block: FirBlock, context: CheckerContex return inspector.declarationConflictingSymbols } -private fun > FirDeclarationCollector.collect( - declaration: D, +private fun , S : D> FirDeclarationCollector.collect( + declaration: S, representation: String, - map: MutableMap>, + map: MutableMap>, ) { map.getOrPut(representation, ::mutableListOf).also { it.add(declaration)