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

FIR Java (raw type bounds erasure): make better protection from recursion

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-11-19 23:22:36 +03:00
parent 95203e9310
commit 137e54db05
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/javaTypeUtils.kt
+3 -2
View File
@@ -186,10 +186,11 @@ private fun FirTypeParameter.getErasedUpperBound(
return firstUpperBound.withArguments(firstUpperBound.typeArguments.map { ConeStarProjection }.toTypedArray()) return firstUpperBound.withArguments(firstUpperBound.typeArguments.map { ConeStarProjection }.toTypedArray())
} }
val stopAt = potentiallyRecursiveTypeParameter ?: this val alreadyVisited = mutableSetOf(potentiallyRecursiveTypeParameter, this)
var current = (firstUpperBound as ConeTypeParameterType).lookupTag.typeParameterSymbol.fir var current = (firstUpperBound as ConeTypeParameterType).lookupTag.typeParameterSymbol.fir
while (current != stopAt) { while (current !in alreadyVisited) {
alreadyVisited += current
val nextUpperBound = current.bounds.first().coneTypeUnsafe<ConeKotlinType>() val nextUpperBound = current.bounds.first().coneTypeUnsafe<ConeKotlinType>()
if (nextUpperBound is ConeClassLikeType) { if (nextUpperBound is ConeClassLikeType) {