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

NI. Fix StackOverFlow in type approximation. #KT-30021 Fixed

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-03-07 16:24:53 +03:00
parent cbf1d773f7
commit 9b50d31169
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/types/TypeApproximator.kt
+6 -4
View File
@@ -206,10 +206,12 @@ class TypeApproximator {
val baseResult = when (conf.intersection) { val baseResult = when (conf.intersection) {
ALLOWED -> if (!thereIsApproximation) return null else intersectTypes(newTypes) ALLOWED -> if (!thereIsApproximation) return null else intersectTypes(newTypes)
TO_FIRST -> if (toSuper) newTypes.first() else return type.defaultResult(toSuper = false) TO_FIRST -> if (toSuper) newTypes.first() else return type.defaultResult(toSuper = false)
// commonSupertypeCalculator should handle flexible types correctly // commonSupertypeCalculator should handle flexible types correctly
TO_COMMON_SUPERTYPE -> if (toSuper) NewCommonSuperTypeCalculator.commonSuperType(newTypes) else return type.defaultResult( TO_COMMON_SUPERTYPE -> {
toSuper = false if (!toSuper) return type.defaultResult(toSuper = false)
) val resultType = NewCommonSuperTypeCalculator.commonSuperType(newTypes)
approximateToSuperType(resultType.unwrap(), conf) ?: resultType.unwrap()
}
} }
return if (type.isMarkedNullable) baseResult.makeNullableAsSpecified(true) else baseResult return if (type.isMarkedNullable) baseResult.makeNullableAsSpecified(true) else baseResult