azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Fix parameters constraints in FirDeclarationCollector<D>.collect

Browse Source
This commit is contained in:
Nikolay Lunyak
2023-10-25 15:11:35 +03:00
committed by Space Team
parent 44d6d10233
commit 008703c1dc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirConflictsHelpers.kt
+4 -4
View File
@@ -152,7 +152,7 @@ class FirDeclarationCollector<D : FirBasedSymbol<*>>(
fun FirDeclarationCollector<FirBasedSymbol<*>>.collectClassMembers(klass: FirRegularClassSymbol) { fun FirDeclarationCollector<FirBasedSymbol<*>>.collectClassMembers(klass: FirRegularClassSymbol) {
val otherDeclarations = mutableMapOf<String, MutableList<FirBasedSymbol<*>>>() val otherDeclarations = mutableMapOf<String, MutableList<FirBasedSymbol<*>>>()
val functionDeclarations = mutableMapOf<String, MutableList<FirBasedSymbol<*>>>() val functionDeclarations = mutableMapOf<String, MutableList<FirFunctionSymbol<*>>>()
val declaredMemberScope = klass.declaredMemberScope(context) val declaredMemberScope = klass.declaredMemberScope(context)
val unsubstitutedScope = klass.unsubstitutedScope(context) val unsubstitutedScope = klass.unsubstitutedScope(context)
@@ -277,10 +277,10 @@ fun collectConflictingLocalFunctionsFrom(block: FirBlock, context: CheckerContex
return inspector.declarationConflictingSymbols return inspector.declarationConflictingSymbols
} }
private fun <D : FirBasedSymbol<*>> FirDeclarationCollector<D>.collect( private fun <D : FirBasedSymbol<*>, S : D> FirDeclarationCollector<D>.collect(
declaration: D, declaration: S,
representation: String, representation: String,
map: MutableMap<String, MutableList<D>>, map: MutableMap<String, MutableList<S>>,
) { ) {
map.getOrPut(representation, ::mutableListOf).also { map.getOrPut(representation, ::mutableListOf).also {
it.add(declaration) it.add(declaration)