[cls] write contracts information to cls stubs

^ KTIJ-24665
this information would be used to create resolved FirElements from stubs,
so no ProtoBuf would be kept in memory

compiler/fir/tree/build.gradle.kts

@@ -7,6 +7,7 @@ plugins {
 
 dependencies {
     api(project(":compiler:frontend.common"))
+    api(project(":core:compiler.common"))
     api(project(":compiler:fir:cones"))
 
     // Necessary only to store bound PsiElement inside FirElement

compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt

@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.fir.expressions
 
 import org.jetbrains.kotlin.KtSourceElement
+import org.jetbrains.kotlin.contracts.description.LogicOperationKind
 import org.jetbrains.kotlin.fir.FirElement
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.visitors.*

compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBinaryLogicExpressionBuilder.kt

@@ -9,13 +9,13 @@ package org.jetbrains.kotlin.fir.expressions.builder
 
 import kotlin.contracts.*
 import org.jetbrains.kotlin.KtSourceElement
+import org.jetbrains.kotlin.contracts.description.LogicOperationKind
 import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder
 import org.jetbrains.kotlin.fir.builder.FirBuilderDsl
 import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty
 import org.jetbrains.kotlin.fir.expressions.FirAnnotation
 import org.jetbrains.kotlin.fir.expressions.FirBinaryLogicExpression
 import org.jetbrains.kotlin.fir.expressions.FirExpression
-import org.jetbrains.kotlin.fir.expressions.LogicOperationKind
 import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder
 import org.jetbrains.kotlin.fir.expressions.impl.FirBinaryLogicExpressionImpl
 import org.jetbrains.kotlin.fir.types.FirTypeRef

compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt

@@ -8,10 +8,10 @@
 package org.jetbrains.kotlin.fir.expressions.impl
 
 import org.jetbrains.kotlin.KtSourceElement
+import org.jetbrains.kotlin.contracts.description.LogicOperationKind
 import org.jetbrains.kotlin.fir.expressions.FirAnnotation
 import org.jetbrains.kotlin.fir.expressions.FirBinaryLogicExpression
 import org.jetbrains.kotlin.fir.expressions.FirExpression
-import org.jetbrains.kotlin.fir.expressions.LogicOperationKind
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource
 import org.jetbrains.kotlin.fir.visitors.*

compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/description/ConeContractDescription.kt

@@ -1,22 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.contracts.description
-
-interface ConeContractDescriptionElement {
-    fun <R, D> accept(contractDescriptionVisitor: ConeContractDescriptionVisitor<R, D>, data: D): R
-
-    val erroneous: Boolean
-}
-
-abstract class ConeEffectDeclaration : ConeContractDescriptionElement {
-    override fun <R, D> accept(contractDescriptionVisitor: ConeContractDescriptionVisitor<R, D>, data: D): R =
-        contractDescriptionVisitor.visitEffectDeclaration(this, data)
-}
-
-interface ConeBooleanExpression : ConeContractDescriptionElement {
-    override fun <R, D> accept(contractDescriptionVisitor: ConeContractDescriptionVisitor<R, D>, data: D): R =
-        contractDescriptionVisitor.visitBooleanExpression(this, data)
-}

compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/description/ConeContractDescriptionVisitor.kt

@@ -1,69 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.contracts.description
-
-
-abstract class ConeContractDescriptionVisitor<out R, in D> {
-    open fun visitContractDescriptionElement(contractDescriptionElement: ConeContractDescriptionElement, data: D): R {
-        throw IllegalStateException("Top of hierarchy reached, no overloads were found for element: $contractDescriptionElement")
-    }
-
-    // Effects
-    open fun visitEffectDeclaration(effectDeclaration: ConeEffectDeclaration, data: D): R = visitContractDescriptionElement(effectDeclaration, data)
-
-    open fun visitConditionalEffectDeclaration(conditionalEffect: ConeConditionalEffectDeclaration, data: D): R =
-        visitEffectDeclaration(conditionalEffect, data)
-
-    open fun visitReturnsEffectDeclaration(returnsEffect: ConeReturnsEffectDeclaration, data: D): R =
-        visitEffectDeclaration(returnsEffect, data)
-
-    open fun visitCallsEffectDeclaration(callsEffect: ConeCallsEffectDeclaration, data: D): R =
-        visitEffectDeclaration(callsEffect, data)
-
-    open fun visitErroneousCallsEffectDeclaration(callsEffect: ConeErroneousCallsEffectDeclaration, data: D): R =
-        visitCallsEffectDeclaration(callsEffect, data)
-
-    // Expressions
-    open fun visitBooleanExpression(booleanExpression: ConeBooleanExpression, data: D): R =
-        visitContractDescriptionElement(booleanExpression, data)
-
-    open fun visitLogicalBinaryOperationContractExpression(binaryLogicExpression: ConeBinaryLogicExpression, data: D): R =
-        visitBooleanExpression(binaryLogicExpression, data)
-
-    open fun visitLogicalNot(logicalNot: ConeLogicalNot, data: D): R = visitBooleanExpression(logicalNot, data)
-
-    open fun visitIsInstancePredicate(isInstancePredicate: ConeIsInstancePredicate, data: D): R =
-        visitBooleanExpression(isInstancePredicate, data)
-
-    open fun visitErroneousIsInstancePredicate(isInstancePredicate: ConeErroneousIsInstancePredicate, data: D): R =
-        visitIsInstancePredicate(isInstancePredicate, data)
-
-    open fun visitIsNullPredicate(isNullPredicate: ConeIsNullPredicate, data: D): R = visitBooleanExpression(isNullPredicate, data)
-
-    // Values
-    open fun visitValue(value: ConeContractDescriptionValue, data: D): R = visitContractDescriptionElement(value, data)
-
-    open fun visitConstantDescriptor(constantReference: ConeConstantReference, data: D): R = visitValue(constantReference, data)
-
-    open fun visitBooleanConstantDescriptor(booleanConstantDescriptor: ConeBooleanConstantReference, data: D): R =
-        visitConstantDescriptor(booleanConstantDescriptor, data)
-
-    open fun visitErroneousConstantReference(erroneousConstantReference: ConeErroneousConstantReference, data: D): R =
-        visitConstantDescriptor(erroneousConstantReference, data)
-
-    open fun visitValueParameterReference(valueParameterReference: ConeValueParameterReference, data: D): R =
-        visitValue(valueParameterReference, data)
-
-    open fun visitBooleanValueParameterReference(booleanValueParameterReference: ConeBooleanValueParameterReference, data: D): R =
-        visitValueParameterReference(booleanValueParameterReference, data)
-
-    open fun visitErroneousValueParameterReference(valueParameterReference: ConeErroneousValueParameterReference, data: D): R =
-        visitValueParameterReference(valueParameterReference, data)
-
-    // Error
-    open fun visitErroneousElement(element: ConeErroneousContractElement, data: D): R =
-        visitContractDescriptionElement(element, data)
-}

compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/description/ConeContractRenderer.kt

@@ -5,14 +5,17 @@
 
 package org.jetbrains.kotlin.fir.contracts.description
 
+import org.jetbrains.kotlin.contracts.description.*
 import org.jetbrains.kotlin.fir.contracts.*
 import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription
 import org.jetbrains.kotlin.fir.declarations.FirContractDescriptionOwner
 import org.jetbrains.kotlin.fir.declarations.FirDeclaration
+import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic
 import org.jetbrains.kotlin.fir.renderer.FirRendererComponents
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.renderForDebugging
 
-class ConeContractRenderer : ConeContractDescriptionVisitor<Unit, Nothing?>() {
+class ConeContractRenderer : KtContractDescriptionVisitor<Unit, Nothing?, ConeKotlinType, ConeDiagnostic>() {
 
     internal lateinit var components: FirRendererComponents
     private val printer get() = components.printer
@@ -74,54 +77,54 @@ class ConeContractRenderer : ConeContractDescriptionVisitor<Unit, Nothing?>() {
         printer.println(">")
     }
 
-    override fun visitConditionalEffectDeclaration(conditionalEffect: ConeConditionalEffectDeclaration, data: Nothing?) {
+    override fun visitConditionalEffectDeclaration(conditionalEffect: KtConditionalEffectDeclaration<ConeKotlinType, ConeDiagnostic>, data: Nothing?) {
         conditionalEffect.effect.accept(this, data)
         printer.print(" -> ")
         conditionalEffect.condition.accept(this, data)
     }
 
-    override fun visitReturnsEffectDeclaration(returnsEffect: ConeReturnsEffectDeclaration, data: Nothing?) {
+    override fun visitReturnsEffectDeclaration(returnsEffect: KtReturnsEffectDeclaration<ConeKotlinType, ConeDiagnostic>, data: Nothing?) {
         printer.print("Returns(")
         returnsEffect.value.accept(this, data)
         printer.print(")")
     }
 
-    override fun visitCallsEffectDeclaration(callsEffect: ConeCallsEffectDeclaration, data: Nothing?) {
+    override fun visitCallsEffectDeclaration(callsEffect: KtCallsEffectDeclaration<ConeKotlinType, ConeDiagnostic>, data: Nothing?) {
         printer.print("CallsInPlace(")
         callsEffect.valueParameterReference.accept(this, data)
         printer.print(", ${callsEffect.kind})")
     }
 
-    override fun visitLogicalBinaryOperationContractExpression(binaryLogicExpression: ConeBinaryLogicExpression, data: Nothing?) {
+    override fun visitLogicalBinaryOperationContractExpression(binaryLogicExpression: KtBinaryLogicExpression<ConeKotlinType, ConeDiagnostic>, data: Nothing?) {
         inBracketsIfNecessary(binaryLogicExpression, binaryLogicExpression.left) { binaryLogicExpression.left.accept(this, data) }
         printer.print(" ${binaryLogicExpression.kind.token} ")
         inBracketsIfNecessary(binaryLogicExpression, binaryLogicExpression.right) { binaryLogicExpression.right.accept(this, data) }
     }
 
-    override fun visitLogicalNot(logicalNot: ConeLogicalNot, data: Nothing?) {
+    override fun visitLogicalNot(logicalNot: KtLogicalNot<ConeKotlinType, ConeDiagnostic>, data: Nothing?) {
         inBracketsIfNecessary(logicalNot, logicalNot.arg) { printer.print("!") }
         logicalNot.arg.accept(this, data)
     }
 
-    override fun visitIsInstancePredicate(isInstancePredicate: ConeIsInstancePredicate, data: Nothing?) {
+    override fun visitIsInstancePredicate(isInstancePredicate: KtIsInstancePredicate<ConeKotlinType, ConeDiagnostic>, data: Nothing?) {
         isInstancePredicate.arg.accept(this, data)
         printer.print(" ${if (isInstancePredicate.isNegated) "!" else ""}is ${isInstancePredicate.type.renderForDebugging()}")
     }
 
-    override fun visitIsNullPredicate(isNullPredicate: ConeIsNullPredicate, data: Nothing?) {
+    override fun visitIsNullPredicate(isNullPredicate: KtIsNullPredicate<ConeKotlinType, ConeDiagnostic>, data: Nothing?) {
         isNullPredicate.arg.accept(this, data)
         printer.print(" ${if (isNullPredicate.isNegated) "!=" else "=="} null")
     }
 
-    override fun visitConstantDescriptor(constantReference: ConeConstantReference, data: Nothing?) {
+    override fun visitConstantDescriptor(constantReference: KtConstantReference<ConeKotlinType, ConeDiagnostic>, data: Nothing?) {
         printer.print(constantReference.name)
     }
 
-    override fun visitValueParameterReference(valueParameterReference: ConeValueParameterReference, data: Nothing?) {
+    override fun visitValueParameterReference(valueParameterReference: KtValueParameterReference<ConeKotlinType, ConeDiagnostic>, data: Nothing?) {
         printer.print(valueParameterReference.name)
     }
 
-    private fun inBracketsIfNecessary(parent: ConeContractDescriptionElement, child: ConeContractDescriptionElement, block: () -> Unit) {
+    private fun inBracketsIfNecessary(parent: KtContractDescriptionElement<ConeKotlinType, ConeDiagnostic>, child: KtContractDescriptionElement<ConeKotlinType, ConeDiagnostic>, block: () -> Unit) {
         if (needsBrackets(parent, child)) {
             printer.print("(")
             block()
@@ -131,12 +134,12 @@ class ConeContractRenderer : ConeContractDescriptionVisitor<Unit, Nothing?>() {
         }
     }
 
-    private fun ConeContractDescriptionElement.isAtom(): Boolean =
-        this is ConeValueParameterReference || this is ConeConstantReference || this is ConeIsNullPredicate || this is ConeIsInstancePredicate
+    private fun KtContractDescriptionElement<ConeKotlinType, ConeDiagnostic>.isAtom(): Boolean =
+        this is KtValueParameterReference || this is KtConstantReference || this is KtIsNullPredicate || this is KtIsInstancePredicate
 
-    private fun needsBrackets(parent: ConeContractDescriptionElement, child: ConeContractDescriptionElement): Boolean {
+    private fun needsBrackets(parent: KtContractDescriptionElement<ConeKotlinType, ConeDiagnostic>, child: KtContractDescriptionElement<ConeKotlinType, ConeDiagnostic>): Boolean {
         if (child.isAtom()) return false
-        if (parent is ConeLogicalNot) return true
+        if (parent is KtLogicalNot) return true
         return parent::class != child::class
     }
 }

compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/description/ConeEffects.kt

@@ -1,70 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.contracts.description
-
-import org.jetbrains.kotlin.contracts.description.EventOccurrencesRange
-import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic
-
-/**
- * Effect with condition attached to it.
- *
- * [condition] is some expression, which result-type is Boolean, and clause should
- * be interpreted as: "if [effect] took place then [condition]-expression is
- * guaranteed to be true"
- *
- * NB. [effect] and [condition] connected with implication in math logic sense:
- * [effect] => [condition]. In particular this means that:
- *  - there can be multiple ways how [effect] can be produced, but for any of them
- *    [condition] holds.
- *  - if [effect] wasn't observed, we *can't* reason that [condition] is false
- *  - if [condition] is true, we *can't* reason that [effect] will be observed.
- */
-class ConeConditionalEffectDeclaration(val effect: ConeEffectDeclaration, val condition: ConeBooleanExpression) : ConeEffectDeclaration() {
-    override val erroneous: Boolean
-        get() = effect.erroneous || condition.erroneous
-
-    override fun <R, D> accept(contractDescriptionVisitor: ConeContractDescriptionVisitor<R, D>, data: D): R =
-        contractDescriptionVisitor.visitConditionalEffectDeclaration(this, data)
-}
-
-
-/**
- * Effect which specifies that subroutine returns some particular value
- */
-class ConeReturnsEffectDeclaration(val value: ConeConstantReference) : ConeEffectDeclaration() {
-    override val erroneous: Boolean
-        get() = value.erroneous
-
-    override fun <R, D> accept(contractDescriptionVisitor: ConeContractDescriptionVisitor<R, D>, data: D): R =
-        contractDescriptionVisitor.visitReturnsEffectDeclaration(this, data)
-}
-
-
-/**
- * Effect which specifies, that during execution of subroutine, callable [valueParameterReference] will be invoked
- * [kind] amount of times, and will never be invoked after subroutine call is finished.
- */
-open class ConeCallsEffectDeclaration(
-    val valueParameterReference: ConeValueParameterReference,
-    val kind: EventOccurrencesRange
-) : ConeEffectDeclaration() {
-    override val erroneous: Boolean
-        get() = valueParameterReference.erroneous
-
-    override fun <R, D> accept(contractDescriptionVisitor: ConeContractDescriptionVisitor<R, D>, data: D): R =
-        contractDescriptionVisitor.visitCallsEffectDeclaration(this, data)
-}
-
-class ConeErroneousCallsEffectDeclaration(
-    valueParameterReference: ConeValueParameterReference,
-    val diagnostic: ConeDiagnostic
-) : ConeCallsEffectDeclaration(valueParameterReference, EventOccurrencesRange.UNKNOWN) {
-    override val erroneous: Boolean
-        get() = true
-
-    override fun <R, D> accept(contractDescriptionVisitor: ConeContractDescriptionVisitor<R, D>, data: D): R =
-        contractDescriptionVisitor.visitErroneousCallsEffectDeclaration(this, data)
-}

compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/description/ConeErroneousContractElement.kt

@@ -1,19 +0,0 @@
-/*
- * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.contracts.description
-
-import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic
-
-class ConeErroneousContractElement(
-    val diagnostic: ConeDiagnostic
-) : ConeEffectDeclaration(), ConeBooleanExpression, ConeContractDescriptionValue {
-    override val erroneous: Boolean
-        get() = true
-
-    override fun <R, D> accept(contractDescriptionVisitor: ConeContractDescriptionVisitor<R, D>, data: D): R {
-        return contractDescriptionVisitor.visitErroneousElement(this, data)
-    }
-}

compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/description/ConeLogicalCombinators.kt

@@ -1,25 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.contracts.description
-
-import org.jetbrains.kotlin.fir.expressions.LogicOperationKind
-
-class ConeBinaryLogicExpression(val left: ConeBooleanExpression, val right: ConeBooleanExpression, val kind: LogicOperationKind) : ConeBooleanExpression {
-    override val erroneous: Boolean
-        get() = left.erroneous || right.erroneous
-
-    override fun <R, D> accept(contractDescriptionVisitor: ConeContractDescriptionVisitor<R, D>, data: D): R {
-        return contractDescriptionVisitor.visitLogicalBinaryOperationContractExpression(this, data)
-    }
-}
-
-class ConeLogicalNot(val arg: ConeBooleanExpression) : ConeBooleanExpression {
-    override val erroneous: Boolean
-        get() = arg.erroneous
-
-    override fun <R, D> accept(contractDescriptionVisitor: ConeContractDescriptionVisitor<R, D>, data: D): R =
-        contractDescriptionVisitor.visitLogicalNot(this, data)
-}

compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/description/ConePredicates.kt

@@ -1,44 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.contracts.description
-
-import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic
-import org.jetbrains.kotlin.fir.types.ConeKotlinType
-
-open class ConeIsInstancePredicate(val arg: ConeValueParameterReference, val type: ConeKotlinType, val isNegated: Boolean) : ConeBooleanExpression {
-    override val erroneous: Boolean
-        get() = arg.erroneous
-
-    override fun <R, D> accept(contractDescriptionVisitor: ConeContractDescriptionVisitor<R, D>, data: D): R =
-        contractDescriptionVisitor.visitIsInstancePredicate(this, data)
-
-    fun negated(): ConeIsInstancePredicate =
-        ConeIsInstancePredicate(arg, type, isNegated.not())
-}
-
-class ConeErroneousIsInstancePredicate(
-    arg: ConeValueParameterReference,
-    type: ConeKotlinType,
-    isNegated: Boolean,
-    val diagnostic: ConeDiagnostic
-) : ConeIsInstancePredicate(arg, type, isNegated) {
-    override val erroneous: Boolean
-        get() = true
-
-    override fun <R, D> accept(contractDescriptionVisitor: ConeContractDescriptionVisitor<R, D>, data: D): R =
-        contractDescriptionVisitor.visitErroneousIsInstancePredicate(this, data)
-}
-
-class ConeIsNullPredicate(val arg: ConeValueParameterReference, val isNegated: Boolean) : ConeBooleanExpression {
-    override val erroneous: Boolean
-        get() = arg.erroneous
-
-    override fun <R, D> accept(contractDescriptionVisitor: ConeContractDescriptionVisitor<R, D>, data: D): R =
-        contractDescriptionVisitor.visitIsNullPredicate(this, data)
-
-    fun negated(): ConeIsNullPredicate =
-        ConeIsNullPredicate(arg, isNegated.not())
-}

compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/description/ConeValues.kt

@@ -1,74 +1,33 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package org.jetbrains.kotlin.fir.contracts.description
 
+import org.jetbrains.kotlin.contracts.description.*
 import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 
-interface ConeContractDescriptionValue : ConeContractDescriptionElement {
-    override fun <R, D> accept(contractDescriptionVisitor: ConeContractDescriptionVisitor<R, D>, data: D): R =
-        contractDescriptionVisitor.visitValue(this, data)
+object ConeContractConstantValues {
+    val NULL = KtConstantReference<ConeKotlinType, ConeDiagnostic>("NULL")
+    val WILDCARD = KtConstantReference<ConeKotlinType, ConeDiagnostic>("WILDCARD")
+    val NOT_NULL = KtConstantReference<ConeKotlinType, ConeDiagnostic>("NOT_NULL")
+    val TRUE = KtBooleanConstantReference<ConeKotlinType, ConeDiagnostic>("TRUE")
+    val FALSE = KtBooleanConstantReference<ConeKotlinType, ConeDiagnostic>("FALSE")
 }
 
-open class ConeConstantReference protected constructor(val name: String) : ConeContractDescriptionValue {
-    override val erroneous: Boolean
-        get() = false
-
-    override fun <R, D> accept(contractDescriptionVisitor: ConeContractDescriptionVisitor<R, D>, data: D): R =
-        contractDescriptionVisitor.visitConstantDescriptor(this, data)
-
-    companion object {
-        val NULL = ConeConstantReference("NULL")
-        val WILDCARD = ConeConstantReference("WILDCARD")
-        val NOT_NULL = ConeConstantReference("NOT_NULL")
-    }
-}
-
-class ConeBooleanConstantReference private constructor(name: String) : ConeConstantReference(name), ConeBooleanExpression {
-    override fun <R, D> accept(contractDescriptionVisitor: ConeContractDescriptionVisitor<R, D>, data: D): R =
-        contractDescriptionVisitor.visitBooleanConstantDescriptor(this, data)
-
-    companion object {
-        val TRUE = ConeBooleanConstantReference("TRUE")
-        val FALSE = ConeBooleanConstantReference("FALSE")
-    }
-}
-
-class ConeErroneousConstantReference(val diagnostic: ConeDiagnostic) : ConeConstantReference("ERROR") {
-    override val erroneous: Boolean
-        get() = true
-
-    override fun <R, D> accept(contractDescriptionVisitor: ConeContractDescriptionVisitor<R, D>, data: D): R =
-        contractDescriptionVisitor.visitErroneousConstantReference(this, data)
-}
-
-/*
- * Index of value parameter of function
- * -1 means that it is reference to extension receiver
- */
-open class ConeValueParameterReference(val parameterIndex: Int, val name: String) : ConeContractDescriptionValue {
-    init {
-        assert(parameterIndex >= -1)
-    }
-
-    override val erroneous: Boolean
-        get() = false
-
-    override fun <R, D> accept(contractDescriptionVisitor: ConeContractDescriptionVisitor<R, D>, data: D): R =
-        contractDescriptionVisitor.visitValueParameterReference(this, data)
-}
-
-class ConeBooleanValueParameterReference(parameterIndex: Int, name: String) : ConeValueParameterReference(parameterIndex, name), ConeBooleanExpression {
-    override fun <R, D> accept(contractDescriptionVisitor: ConeContractDescriptionVisitor<R, D>, data: D): R =
-        contractDescriptionVisitor.visitBooleanValueParameterReference(this, data)
-}
-
-class ConeErroneousValueParameterReference(val diagnostic: ConeDiagnostic) : ConeValueParameterReference(Int.MAX_VALUE, "ERROR") {
-    override val erroneous: Boolean
-        get() = true
-
-    override fun <R, D> accept(contractDescriptionVisitor: ConeContractDescriptionVisitor<R, D>, data: D): R =
-        contractDescriptionVisitor.visitErroneousValueParameterReference(this, data)
-}
+typealias ConeEffectDeclaration = KtEffectDeclaration<ConeKotlinType, ConeDiagnostic>
+typealias ConeContractDescriptionElement = KtContractDescriptionElement<ConeKotlinType, ConeDiagnostic>
+typealias ConeCallsEffectDeclaration = KtCallsEffectDeclaration<ConeKotlinType, ConeDiagnostic>
+typealias ConeConditionalEffectDeclaration = KtConditionalEffectDeclaration<ConeKotlinType, ConeDiagnostic>
+typealias ConeReturnsEffectDeclaration = KtReturnsEffectDeclaration<ConeKotlinType, ConeDiagnostic>
+typealias ConeConstantReference = KtConstantReference<ConeKotlinType, ConeDiagnostic>
+typealias ConeIsNullPredicate = KtIsNullPredicate<ConeKotlinType, ConeDiagnostic>
+typealias ConeIsInstancePredicate = KtIsInstancePredicate<ConeKotlinType, ConeDiagnostic>
+typealias ConeLogicalNot = KtLogicalNot<ConeKotlinType, ConeDiagnostic>
+typealias ConeBooleanExpression = KtBooleanExpression<ConeKotlinType, ConeDiagnostic>
+typealias ConeBinaryLogicExpression = KtBinaryLogicExpression<ConeKotlinType, ConeDiagnostic>
+typealias ConeBooleanConstantReference = KtBooleanConstantReference<ConeKotlinType, ConeDiagnostic>
+typealias ConeValueParameterReference = KtValueParameterReference<ConeKotlinType, ConeDiagnostic>
+typealias ConeBooleanValueParameterReference = KtBooleanValueParameterReference<ConeKotlinType, ConeDiagnostic>

compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/LogicOperationKind.kt

@@ -1,10 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.expressions
-
-enum class LogicOperationKind(val token: String) {
-    AND("&&"), OR("||")
-}

compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/Types.kt

@@ -42,7 +42,7 @@ val smartcastStabilityType = type(SmartcastStability::class)
 val fqNameType = type(FqName::class)
 val classIdType = type(ClassId::class)
 val annotationUseSiteTargetType = type(AnnotationUseSiteTarget::class)
-val operationKindType = type("fir.expressions", "LogicOperationKind")
+val operationKindType = type("contracts.description", "LogicOperationKind")
 val coneKotlinTypeType = type(ConeKotlinType::class)
 val coneSimpleKotlinTypeType = type(ConeSimpleKotlinType::class)
 val coneClassLikeTypeType = type(ConeClassLikeType::class)