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

[Type system] Fix algorithm of folding recursive types

Browse Source 
There was a problem when we get type from type projection even if
  it is a star projection what is meaningless. Now we try to fold argument
  only if it's not a star projection
This commit is contained in:
Dmitriy Novozhilov
2019-07-23 16:43:38 +03:00
committed by Mikhail Glukhikh
parent a453ed50fa
commit 71ca1aa608
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/NewCommonSuperTypeCalculator.kt
+11 -6
View File
@@ -205,20 +205,25 @@ object NewCommonSuperTypeCalculator {
} }
} }
val argument = // This is used for folding recursive types like Inv<Inv<*>> into Inv<*>
if (thereIsStar || typeProjections.isEmpty()) { fun collapseRecursiveArgumentIfPossible(argument: TypeArgumentMarker): TypeArgumentMarker {
createStarProjection(parameter) if (argument.isStarProjection()) return argument
} else {
val argument = calculateArgument(parameter, typeProjections, depth)
val argumentType = argument.getType().asSimpleType() val argumentType = argument.getType().asSimpleType()
val argumentConstructor = argumentType?.typeConstructor() val argumentConstructor = argumentType?.typeConstructor()
if (argument.getVariance() == TypeVariance.OUT && argumentConstructor == constructor && argumentType.asArgumentList()[index].isStarProjection()) { return if (argument.getVariance() == TypeVariance.OUT && argumentConstructor == constructor && argumentType.asArgumentList()[index].isStarProjection()) {
createStarProjection(parameter) createStarProjection(parameter)
} else { } else {
argument argument
} }
} }
val argument =
if (thereIsStar || typeProjections.isEmpty()) {
createStarProjection(parameter)
} else {
collapseRecursiveArgumentIfPossible(calculateArgument(parameter, typeProjections, depth))
}
arguments.add(argument) arguments.add(argument)
} }
return createSimpleType(constructor, arguments, nullable = false) return createSimpleType(constructor, arguments, nullable = false)