From 008703c1dc351951ea06010cf2dfaffd4e2c2988 Mon Sep 17 00:00:00 2001
From: Nikolay Lunyak <nikolay.lunyak@jetbrains.com>
Date: Wed, 25 Oct 2023 15:11:35 +0300
Subject: [PATCH] [FIR] Fix parameters constraints in
 `FirDeclarationCollector<D>.collect`

---
 .../kotlin/fir/analysis/checkers/FirConflictsHelpers.kt   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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<D : FirBasedSymbol<*>>(
 
 fun FirDeclarationCollector<FirBasedSymbol<*>>.collectClassMembers(klass: FirRegularClassSymbol) {
     val otherDeclarations = mutableMapOf<String, MutableList<FirBasedSymbol<*>>>()
-    val functionDeclarations = mutableMapOf<String, MutableList<FirBasedSymbol<*>>>()
+    val functionDeclarations = mutableMapOf<String, MutableList<FirFunctionSymbol<*>>>()
     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 <D : FirBasedSymbol<*>> FirDeclarationCollector<D>.collect(
-    declaration: D,
+private fun <D : FirBasedSymbol<*>, S : D> FirDeclarationCollector<D>.collect(
+    declaration: S,
     representation: String,
-    map: MutableMap<String, MutableList<D>>,
+    map: MutableMap<String, MutableList<S>>,
 ) {
     map.getOrPut(representation, ::mutableListOf).also {
         it.add(declaration)