[FIR] Revert workaround for IC issue surfaced by KT-58335

#KT-28233
This commit is contained in:
Kirill Rakhman
2023-05-11 17:42:43 +02:00
committed by Space Team
parent 878dd67d92
commit a50ae9db9d
16 changed files with 6 additions and 108 deletions
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.fir.deserialization
import org.jetbrains.kotlin.builtins.functions.FunctionTypeKind
import org.jetbrains.kotlin.fir.FirModuleData
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.computeTypeAttributes
import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
@@ -203,22 +202,14 @@ class FirTypeDeserializer(
}
// TODO: Return abbreviated types for type aliases, see KT-58542
// This condition is true when the type is precompiled for incremental compilation.
// Using the expanded type leads to the issue described in KT-28233 so we work around it by using the abbreviated type.
// The proper solution would be to mark files that depend on a changed type alias as dirty during IC.
return if (moduleData.session.kind == FirSession.Kind.Source) {
val abbreviatedTypeProto = proto.abbreviatedType(typeTable) ?: return simpleType
simpleType(abbreviatedTypeProto, attributes)
} else {
simpleType
}
return simpleType
}
private fun createSuspendFunctionTypeForBasicCase(
functionTypeConstructor: ConeClassLikeLookupTag,
arguments: Array<ConeTypeProjection>,
isNullable: Boolean,
attributes: ConeAttributes,
attributes: ConeAttributes
): ConeClassLikeType? {
fun ConeClassLikeType.isContinuation(): Boolean {
if (this.typeArguments.size != 1) return false