[FIR] Get rid of FirResolvedTypeRef.isSuspend

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt

@@ -55,6 +55,7 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
 import org.jetbrains.kotlin.descriptors.DescriptorVisibility
+import org.jetbrains.kotlin.fir.resolve.inference.isSuspendFunctionType
 
 @OptIn(ObsoleteDescriptorBasedAPI::class)
 class Fir2IrDeclarationStorage(
@@ -408,7 +409,7 @@ class Fir2IrDeclarationStorage(
             ?: if (isLambda) Name.special("<anonymous>") else Name.special("<no name provided>")
         val visibility = simpleFunction?.visibility ?: Visibilities.Local
         val isSuspend =
-            if (isLambda) ((function as FirAnonymousFunction).typeRef as? FirResolvedTypeRef)?.isSuspend == true
+            if (isLambda) ((function as FirAnonymousFunction).typeRef as? FirResolvedTypeRef)?.type?.isSuspendFunctionType(session) == true
             else simpleFunction?.isSuspend == true
         val signature = if (isLocal) null else signatureComposer.composeSignature(function)
         val created = function.convertWithOffsets { startOffset, endOffset ->

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt

@@ -58,7 +58,6 @@ fun FirFunction<*>.constructFunctionalTypeRef(isSuspend: Boolean = false): FirRe
     return buildResolvedTypeRef {
         source = this@constructFunctionalTypeRef.source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef)
         type = functionalType
-        this.isSuspend = isSuspend
     }
 }
 

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirIntegerLiteralTypeScope.kt

@@ -174,10 +174,7 @@ class FirIntegerOperator @FirImplementationDetail constructor(
     }
 }
 
-class FirILTTypeRefPlaceHolder(
-    isUnsigned: Boolean,
-    override val isSuspend: Boolean = false
-) : FirResolvedTypeRef() {
+class FirILTTypeRefPlaceHolder(isUnsigned: Boolean) : FirResolvedTypeRef() {
     override val source: FirSourceElement? get() = null
     override val annotations: List<FirAnnotationCall> get() = emptyList()
     override var type: ConeIntegerLiteralType = ConeIntegerLiteralTypeImpl(0, isUnsigned)

compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt

@@ -21,7 +21,6 @@ abstract class FirErrorTypeRef : FirResolvedTypeRef(), FirDiagnosticHolder {
     abstract override val annotations: List<FirAnnotationCall>
     abstract override val type: ConeKotlinType
     abstract override val delegatedTypeRef: FirTypeRef?
-    abstract override val isSuspend: Boolean
     abstract override val diagnostic: ConeDiagnostic
 
     override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R = visitor.visitErrorTypeRef(this, data)

compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedFunctionTypeRef.kt

@@ -20,11 +20,11 @@ abstract class FirResolvedFunctionTypeRef : FirResolvedTypeRef(), FirFunctionTyp
     abstract override val annotations: List<FirAnnotationCall>
     abstract override val type: ConeKotlinType
     abstract override val delegatedTypeRef: FirTypeRef?
-    abstract override val isSuspend: Boolean
     abstract override val isMarkedNullable: Boolean
     abstract override val receiverTypeRef: FirTypeRef?
     abstract override val valueParameters: List<FirValueParameter>
     abstract override val returnTypeRef: FirTypeRef
+    abstract override val isSuspend: Boolean
 
     override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R = visitor.visitResolvedFunctionTypeRef(this, data)
 

compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt

@@ -20,7 +20,6 @@ abstract class FirResolvedTypeRef : FirPureAbstractElement(), FirTypeRef {
     abstract override val annotations: List<FirAnnotationCall>
     abstract val type: ConeKotlinType
     abstract val delegatedTypeRef: FirTypeRef?
-    abstract val isSuspend: Boolean
 
     override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R = visitor.visitResolvedTypeRef(this, data)
 

compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedFunctionTypeRefBuilder.kt

@@ -27,22 +27,22 @@ class FirResolvedFunctionTypeRefBuilder : FirAnnotationContainerBuilder {
     override var source: FirSourceElement? = null
     override val annotations: MutableList<FirAnnotationCall> = mutableListOf()
     lateinit var type: ConeKotlinType
-    var isSuspend: Boolean by kotlin.properties.Delegates.notNull<Boolean>()
     var isMarkedNullable: Boolean by kotlin.properties.Delegates.notNull<Boolean>()
     var receiverTypeRef: FirTypeRef? = null
     val valueParameters: MutableList<FirValueParameter> = mutableListOf()
     lateinit var returnTypeRef: FirTypeRef
+    var isSuspend: Boolean by kotlin.properties.Delegates.notNull<Boolean>()
 
     override fun build(): FirResolvedFunctionTypeRef {
         return FirResolvedFunctionTypeRefImpl(
             source,
             annotations,
             type,
-            isSuspend,
             isMarkedNullable,
             receiverTypeRef,
             valueParameters,
             returnTypeRef,
+            isSuspend,
         )
     }
 
@@ -65,10 +65,10 @@ inline fun buildResolvedFunctionTypeRefCopy(original: FirResolvedFunctionTypeRef
     copyBuilder.source = original.source
     copyBuilder.annotations.addAll(original.annotations)
     copyBuilder.type = original.type
-    copyBuilder.isSuspend = original.isSuspend
     copyBuilder.isMarkedNullable = original.isMarkedNullable
     copyBuilder.receiverTypeRef = original.receiverTypeRef
     copyBuilder.valueParameters.addAll(original.valueParameters)
     copyBuilder.returnTypeRef = original.returnTypeRef
+    copyBuilder.isSuspend = original.isSuspend
     return copyBuilder.apply(init).build()
 }

compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedTypeRefBuilder.kt

@@ -28,7 +28,6 @@ class FirResolvedTypeRefBuilder : FirAnnotationContainerBuilder {
     override val annotations: MutableList<FirAnnotationCall> = mutableListOf()
     lateinit var type: ConeKotlinType
     var delegatedTypeRef: FirTypeRef? = null
-    var isSuspend: Boolean = false
 
     @OptIn(FirImplementationDetail::class)
     override fun build(): FirResolvedTypeRef {
@@ -37,7 +36,6 @@ class FirResolvedTypeRefBuilder : FirAnnotationContainerBuilder {
             annotations,
             type,
             delegatedTypeRef,
-            isSuspend,
         )
     }
 
@@ -61,6 +59,5 @@ inline fun buildResolvedTypeRefCopy(original: FirResolvedTypeRef, init: FirResol
     copyBuilder.annotations.addAll(original.annotations)
     copyBuilder.type = original.type
     copyBuilder.delegatedTypeRef = original.delegatedTypeRef
-    copyBuilder.isSuspend = original.isSuspend
     return copyBuilder.apply(init).build()
 }

compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirErrorTypeRefImpl.kt

@@ -26,7 +26,6 @@ internal class FirErrorTypeRefImpl(
     override val annotations: MutableList<FirAnnotationCall> = mutableListOf()
     override val type: ConeKotlinType = ConeClassErrorType(diagnostic)
     override val delegatedTypeRef: FirTypeRef? get() = null
-    override val isSuspend: Boolean = false
 
     override fun <R, D> acceptChildren(visitor: FirVisitor<R, D>, data: D) {
         annotations.forEach { it.accept(visitor, data) }

compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedFunctionTypeRefImpl.kt

@@ -22,11 +22,11 @@ internal class FirResolvedFunctionTypeRefImpl(
     override val source: FirSourceElement?,
     override val annotations: MutableList<FirAnnotationCall>,
     override val type: ConeKotlinType,
-    override val isSuspend: Boolean,
     override val isMarkedNullable: Boolean,
     override var receiverTypeRef: FirTypeRef?,
     override val valueParameters: MutableList<FirValueParameter>,
     override var returnTypeRef: FirTypeRef,
+    override val isSuspend: Boolean,
 ) : FirResolvedFunctionTypeRef() {
     override val delegatedTypeRef: FirTypeRef? get() = null
 

compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt

@@ -23,7 +23,6 @@ class FirResolvedTypeRefImpl @FirImplementationDetail constructor(
     override val annotations: MutableList<FirAnnotationCall>,
     override val type: ConeKotlinType,
     override var delegatedTypeRef: FirTypeRef?,
-    override val isSuspend: Boolean,
 ) : FirResolvedTypeRef() {
     override fun <R, D> acceptChildren(visitor: FirVisitor<R, D>, data: D) {
         annotations.forEach { it.accept(visitor, data) }

compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitBuiltinTypeRef.kt

@@ -34,9 +34,6 @@ sealed class FirImplicitBuiltinTypeRef(
     override val delegatedTypeRef: FirTypeRef?
         get() = null
 
-    override val isSuspend: Boolean
-        get() = false
-
     override fun <R, D> acceptChildren(visitor: FirVisitor<R, D>, data: D) {}
 
     override fun <D> transformChildren(transformer: FirTransformer<D>, data: D): FirElement {

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

@@ -216,7 +216,6 @@ object BuilderConfigurator : AbstractBuilderConfigurator<FirTreeBuilder>(FirTree
         }
 
         builder(resolvedTypeRef) {
-            defaultFalse("isSuspend")
             defaultNull("delegatedTypeRef")
             withCopy()
         }

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

@@ -145,7 +145,6 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator()
                 withGetter = true
             }
             default("annotations", "mutableListOf()")
-            defaultFalse("isSuspend")
             useTypes(coneClassErrorTypeType)
         }
 

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

@@ -561,7 +561,6 @@ object NodeConfigurator : AbstractFieldConfigurator<FirTreeBuilder>(FirTreeBuild
         resolvedTypeRef.configure {
             +field("type", coneKotlinTypeType)
             +field("delegatedTypeRef", typeRef, nullable = true)
-            +booleanField("isSuspend")
         }
 
         typeRefWithNullability.configure {