Skip to content

Commit 339e6ff

Browse files
lunakolySpace Team
authored andcommitted
[Build] Drop suppressions from ^KT-79453
See `6b448121`. See `6b448121`. Also replace a funny `else if` check with a more conventional/readable `if`. See `cafee851`.
1 parent 37921ea commit 339e6ff

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/TypeUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -994,8 +994,8 @@ fun ConeKotlinType.canBeNull(
994994
considerTypeVariableBounds: Boolean = true,
995995
visited: MutableSet<ConeKotlinType> = mutableSetOf(),
996996
): Boolean {
997+
if (!visited.add(this)) return false
997998
return when (this) {
998-
else if !visited.add(this) -> false
999999
is ConeFlexibleType -> upperBound.canBeNull(session, considerTypeVariableBounds, visited)
10001000
is ConeDefinitelyNotNullType -> false
10011001
is ConeTypeParameterType -> isMarkedNullable || this.lookupTag.typeParameterSymbol.resolvedBounds.all {

compiler/frontend/cfg/src/org/jetbrains/kotlin/cfg/ControlFlowInfo.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ internal constructor(
3535
) : ImmutableMap<K, D> by map, ReadOnlyControlFlowInfo<K, D> {
3636
protected abstract fun copy(newMap: ImmutableMap<K, D>): S
3737

38-
// KT-79453: Drop the suppression after the next bootstrap update
39-
@Suppress("CAST_NEVER_SUCCEEDS")
4038
override fun put(key: K, value: D): S = put(key, value, this[key].getOrElse(null as D?))
4139

4240
/**
@@ -50,8 +48,6 @@ internal constructor(
5048
return copy(map.put(key, value))
5149
}
5250

53-
// KT-79453: Drop the suppression after the next bootstrap update
54-
@Suppress("CAST_NEVER_SUCCEEDS")
5551
override fun getOrNull(key: K): D? = this[key].getOrElse(null as D?)
5652
override fun asMap() = this
5753

0 commit comments

Comments
 (0)