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

Fix for EA-74904.

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-10-28 13:08:28 +03:00
parent 98379d64e8
commit 0120139f9c
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt
+12 -12
View File
@@ -129,17 +129,6 @@ public open class DelegatingFlexibleType protected constructor(
} }
} }
init {
if (ASSERTIONS_ENABLED) { // workaround for KT-7540
assert (!lowerBound.isFlexible()) { "Lower bound of a flexible type can not be flexible: $lowerBound" }
assert (!upperBound.isFlexible()) { "Upper bound of a flexible type can not be flexible: $upperBound" }
assert (lowerBound != upperBound) { "Lower and upper bounds are equal: $lowerBound == $upperBound" }
assert (KotlinTypeChecker.DEFAULT.isSubtypeOf(lowerBound, upperBound)) {
"Lower bound $lowerBound of a flexible type must be a subtype of the upper bound $upperBound"
}
}
}
override fun <T : TypeCapability> getCapability(capabilityClass: Class<T>): T? { override fun <T : TypeCapability> getCapability(capabilityClass: Class<T>): T? {
val extra = extraCapabilities.getCapability(capabilityClass, this, this) val extra = extraCapabilities.getCapability(capabilityClass, this, this)
if (extra != null) return extra if (extra != null) return extra
@@ -161,7 +150,18 @@ public open class DelegatingFlexibleType protected constructor(
override fun isMarkedNullable(): Boolean = getCapability(javaClass<NullAwareness>())!!.computeIsNullable() override fun isMarkedNullable(): Boolean = getCapability(javaClass<NullAwareness>())!!.computeIsNullable()
override val delegateType: KotlinType = lowerBound override val delegateType: KotlinType by lazy {
// we can't check this in init block, because lowerBound & upperBound can be LazyType. see EA-74904
if (ASSERTIONS_ENABLED) { // workaround for KT-7540
assert (!lowerBound.isFlexible()) { "Lower bound of a flexible type can not be flexible: $lowerBound" }
assert (!upperBound.isFlexible()) { "Upper bound of a flexible type can not be flexible: $upperBound" }
assert (lowerBound != upperBound) { "Lower and upper bounds are equal: $lowerBound == $upperBound" }
assert (KotlinTypeChecker.DEFAULT.isSubtypeOf(lowerBound, upperBound)) {
"Lower bound $lowerBound of a flexible type must be a subtype of the upper bound $upperBound"
}
}
lowerBound
}
override fun getDelegate() = getCapability(javaClass<FlexibleTypeDelegation>())!!.delegateType override fun getDelegate() = getCapability(javaClass<FlexibleTypeDelegation>())!!.delegateType