From 1071669a929828c6abc7eed766c6284854e34c44 Mon Sep 17 00:00:00 2001 From: "Denis.Zharkov" Date: Mon, 27 Mar 2023 14:04:07 +0200 Subject: [PATCH] Fix project K2-bootstrapping when KT-57609 breaking change is introduced --- .../cones/src/org/jetbrains/kotlin/fir/types/ConeAttributes.kt | 2 +- .../src/org/jetbrains/kotlin/types/TypeAttributes.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeAttributes.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeAttributes.kt index 01a2ff30ab0..fa21e61e111 100644 --- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeAttributes.kt +++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeAttributes.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.utils.addIfNotNull import kotlin.properties.ReadOnlyProperty import kotlin.reflect.KClass -abstract class ConeAttribute> : AnnotationMarker { +abstract class ConeAttribute> : AnnotationMarker { abstract fun union(other: @UnsafeVariance T?): T? abstract fun intersect(other: @UnsafeVariance T?): T? diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/TypeAttributes.kt b/core/descriptors/src/org/jetbrains/kotlin/types/TypeAttributes.kt index 2657cac2217..2ba8ed9b982 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeAttributes.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeAttributes.kt @@ -14,7 +14,7 @@ import java.util.concurrent.ConcurrentHashMap import kotlin.properties.ReadOnlyProperty import kotlin.reflect.KClass -abstract class TypeAttribute> : AnnotationMarker { +abstract class TypeAttribute> : AnnotationMarker { abstract fun union(other: @UnsafeVariance T?): T? abstract fun intersect(other: @UnsafeVariance T?): T?