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

[FIR] Collect all supertypes with same type constructor in corresponding supertypes cache

Browse Source 
This is needed to fir behavior of cache with algorithm in
  abstract type checker
This commit is contained in:
Dmitriy Novozhilov
2021-11-19 18:04:01 +03:00
parent d72fcc92fe
commit 339c69fef0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/FirCorrespondingSupertypesCache.kt
+5 -4
View File
@@ -56,8 +56,8 @@ class FirCorrespondingSupertypesCache(private val session: FirSession) : FirSess
private fun computeSupertypesMap( private fun computeSupertypesMap(
subtypeLookupTag: ConeClassLikeLookupTag, subtypeLookupTag: ConeClassLikeLookupTag,
state: TypeCheckerState state: TypeCheckerState
): Map<ConeClassLikeLookupTag, List<ConeClassLikeType>>? { ): Map<ConeClassLikeLookupTag, MutableList<ConeClassLikeType>>? {
val resultingMap = HashMap<ConeClassLikeLookupTag, List<ConeClassLikeType>>() val resultingMap = HashMap<ConeClassLikeLookupTag, MutableList<ConeClassLikeType>>()
val subtypeFirClass: FirClassLikeDeclaration = subtypeLookupTag.toSymbol(session)?.fir ?: return null val subtypeFirClass: FirClassLikeDeclaration = subtypeLookupTag.toSymbol(session)?.fir ?: return null
@@ -83,14 +83,15 @@ class FirCorrespondingSupertypesCache(private val session: FirSession) : FirSess
private fun computeSupertypePolicyAndPutInMap( private fun computeSupertypePolicyAndPutInMap(
supertype: SimpleTypeMarker, supertype: SimpleTypeMarker,
resultingMap: MutableMap<ConeClassLikeLookupTag, List<ConeClassLikeType>>, resultingMap: MutableMap<ConeClassLikeLookupTag, MutableList<ConeClassLikeType>>,
state: TypeCheckerState state: TypeCheckerState
): TypeCheckerState.SupertypesPolicy { ): TypeCheckerState.SupertypesPolicy {
val supertypeLookupTag = (supertype as ConeClassLikeType).lookupTag val supertypeLookupTag = (supertype as ConeClassLikeType).lookupTag
val captured = val captured =
state.typeSystemContext.captureFromArguments(supertype, CaptureStatus.FOR_SUBTYPING) as ConeClassLikeType? ?: supertype state.typeSystemContext.captureFromArguments(supertype, CaptureStatus.FOR_SUBTYPING) as ConeClassLikeType? ?: supertype
resultingMap[supertypeLookupTag] = listOf(captured) val list = resultingMap.computeIfAbsent(supertypeLookupTag) { mutableListOf() }
list += captured
return when { return when {
with(state.typeSystemContext) { captured.argumentsCount() } == 0 -> { with(state.typeSystemContext) { captured.argumentsCount() } == 0 -> {