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

Use intersection of star projection type-param bounds instead of type

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-04-30 17:13:41 +03:00
committed by Mikhail Glukhikh
parent b48e0a89c5
commit 88a9349f32
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/types/TypeApproximator.kt
+5 -1
View File
@@ -286,7 +286,11 @@ abstract class AbstractTypeApproximator(val ctx: TypeSystemInferenceExtensionCon
// Once NI will be more stabilized, we'll use more specific type // Once NI will be more stabilized, we'll use more specific type
else -> type.typeConstructorProjection().getType()//.unwrap() else -> {
val projection = type.typeConstructorProjection()
if (projection.isStarProjection()) intersectTypes(supertypes.toList())
else projection.getType()
}
} }
val baseSubType = type.lowerType() ?: nothingType() val baseSubType = type.lowerType() ?: nothingType()