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

After approximation interpret Contr<*> as Contr<Nothing>

Browse Source 
not Contr<out Any?>
This commit is contained in:
Svetlana Isakova
2014-12-10 16:05:51 +03:00
parent 14a53a105b
commit c097e6ee3e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/capturedTypeApproximation/contravariant.kt
+1 -1
View File
@@ -8,4 +8,4 @@ fun foo<T>(a: Contr<T>) {}
// T captures 'out Int' // T captures 'out Int'
// lower: Contr<Int> // lower: Contr<Int>
// upper: Contr<out Any?> // upper: Contr<Nothing>
core/descriptors/src/org/jetbrains/jet/lang/types/CapturedTypeApproximation.kt
+2 -1
View File
@@ -58,7 +58,8 @@ private fun TypeArgument.toTypeProjection(): TypeProjection {
fun removeProjectionIfRedundant(variance: Variance) = if (variance == typeParameter.getVariance()) Variance.INVARIANT else variance fun removeProjectionIfRedundant(variance: Variance) = if (variance == typeParameter.getVariance()) Variance.INVARIANT else variance
return when { return when {
inProjection == outProjection -> TypeProjectionImpl(inProjection) inProjection == outProjection -> TypeProjectionImpl(inProjection)
inProjection == NOTHING || inProjection == NULLABLE_NOTHING -> TypeProjectionImpl(removeProjectionIfRedundant(Variance.OUT_VARIANCE), outProjection) (inProjection == NOTHING || inProjection == NULLABLE_NOTHING) && typeParameter.getVariance() != Variance.IN_VARIANCE ->
TypeProjectionImpl(removeProjectionIfRedundant(Variance.OUT_VARIANCE), outProjection)
outProjection == NULLABLE_ANY -> TypeProjectionImpl(removeProjectionIfRedundant(Variance.IN_VARIANCE), inProjection) outProjection == NULLABLE_ANY -> TypeProjectionImpl(removeProjectionIfRedundant(Variance.IN_VARIANCE), inProjection)
else -> throw AssertionError("Enhanced type projection can't be converted to type projection: $this") else -> throw AssertionError("Enhanced type projection can't be converted to type projection: $this")
} }