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

[FIR] Never create ConeSubstitutorByMap with empty substitution

Browse Source 
Relates to KT-66323
This commit is contained in:
Dmitriy Novozhilov
2024-03-04 08:51:37 +02:00
committed by Space Team
parent 6c691b497a
commit 624bea3ecf
16 changed files with 57 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt
+2 -2
View File
@@ -1024,7 +1024,7 @@ abstract class FirDataFlowAnalyzer(
val substitutionFromArguments = typeParameters.zip(qualifiedAccess.typeArguments).map { (typeParameterRef, typeArgument) ->
typeParameterRef.symbol to typeArgument.toConeTypeProjection().type
}.filter { it.second != null }.toMap() as Map<FirTypeParameterSymbol, ConeKotlinType>
ConeSubstitutorByMap(substitutionFromArguments, components.session)
ConeSubstitutorByMap.create(substitutionFromArguments, components.session)
} else {
ConeSubstitutor.Empty
}
@@ -1034,7 +1034,7 @@ abstract class FirDataFlowAnalyzer(
typeArgumentsSubstitutor
} else {
val map = originalFunction.symbol.typeParameterSymbols.zip(typeParameters.map { it.symbol.toConeType() }).toMap()
ConeSubstitutorByMap(map, components.session).chain(typeArgumentsSubstitutor)
ConeSubstitutorByMap.create(map, components.session).chain(typeArgumentsSubstitutor)
}
for (conditionalEffect in conditionalEffects) {