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

FIR: Reorder when entries in ConeTypeContext::typeConstructor

Browse Source 
More expected types should be checked first
This commit is contained in:
Denis Zharkov
2019-12-13 17:25:31 +03:00
parent a14852a6ec
commit 1790dcf80c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt
+3 -3
View File
@@ -130,11 +130,11 @@ interface ConeTypeContext : TypeSystemContext, TypeSystemOptimizationContext, Ty
override fun SimpleTypeMarker.typeConstructor(): TypeConstructorMarker { override fun SimpleTypeMarker.typeConstructor(): TypeConstructorMarker {
return when (this) { return when (this) {
is ConeCapturedType -> constructor
is ConeTypeVariableType -> lookupTag as ConeTypeVariableTypeConstructor // TODO: WTF
is ConeClassLikeType -> lookupTag.toSymbol(session) is ConeClassLikeType -> lookupTag.toSymbol(session)
?: ErrorTypeConstructor("Unresolved: $lookupTag") ?: ErrorTypeConstructor("Unresolved: $lookupTag")
is ConeLookupTagBasedType -> lookupTag.toSymbol(session) ?: ErrorTypeConstructor("Unresolved: $lookupTag") is ConeTypeParameterType -> lookupTag.typeParameterSymbol
is ConeCapturedType -> constructor
is ConeTypeVariableType -> lookupTag as ConeTypeVariableTypeConstructor // TODO: WTF
is ConeIntersectionType -> this is ConeIntersectionType -> this
is ConeStubType -> variable.typeConstructor is ConeStubType -> variable.typeConstructor
is ConeDefinitelyNotNullType -> original.typeConstructor() is ConeDefinitelyNotNullType -> original.typeConstructor()