diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirUpperBoundViolatedHelpers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirUpperBoundViolatedHelpers.kt index ed3423d641c..39876d444c5 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirUpperBoundViolatedHelpers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirUpperBoundViolatedHelpers.kt @@ -129,17 +129,9 @@ private class FE10LikeConeSubstitutor( } private class OriginalProjectionTypeAttribute(val data: ConeTypeProjection) : ConeAttribute() { - override fun union(other: OriginalProjectionTypeAttribute?): OriginalProjectionTypeAttribute? { - return other - } - - override fun intersect(other: OriginalProjectionTypeAttribute?): OriginalProjectionTypeAttribute? { - return other - } - - override fun add(other: OriginalProjectionTypeAttribute?): OriginalProjectionTypeAttribute? { - return other - } + override fun union(other: OriginalProjectionTypeAttribute?): OriginalProjectionTypeAttribute = other ?: this + override fun intersect(other: OriginalProjectionTypeAttribute?): OriginalProjectionTypeAttribute = other ?: this + override fun add(other: OriginalProjectionTypeAttribute?): OriginalProjectionTypeAttribute = other ?: this override fun isSubtypeOf(other: OriginalProjectionTypeAttribute?): Boolean { return true