[FIR] Rename ConeClassErrorType to ConeErrorType, drop ConeKotlinErrorType alias
This commit is contained in:
committed by
teamcity
parent
9c6292db6f
commit
0bd3e8f418
+1
-1
@@ -652,7 +652,7 @@ class FirElementSerializer private constructor(
|
||||
val builder = ProtoBuf.Type.newBuilder()
|
||||
when (type) {
|
||||
is ConeDefinitelyNotNullType -> return typeProto(type.original, toSuper, correspondingTypeRef, isDefinitelyNotNullType = true)
|
||||
is ConeKotlinErrorType -> {
|
||||
is ConeErrorType -> {
|
||||
extension.serializeErrorType(type, builder)
|
||||
return builder
|
||||
}
|
||||
|
||||
+2
-2
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.fir.FirSession
|
||||
import org.jetbrains.kotlin.fir.declarations.*
|
||||
import org.jetbrains.kotlin.fir.expressions.FirAnnotation
|
||||
import org.jetbrains.kotlin.fir.types.ConeFlexibleType
|
||||
import org.jetbrains.kotlin.fir.types.ConeKotlinErrorType
|
||||
import org.jetbrains.kotlin.fir.types.ConeErrorType
|
||||
import org.jetbrains.kotlin.metadata.ProtoBuf
|
||||
import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion
|
||||
import org.jetbrains.kotlin.metadata.serialization.MutableVersionRequirementTable
|
||||
@@ -83,7 +83,7 @@ abstract class FirSerializerExtension {
|
||||
open fun serializeTypeAlias(typeAlias: FirTypeAlias, proto: ProtoBuf.TypeAlias.Builder) {
|
||||
}
|
||||
|
||||
open fun serializeErrorType(type: ConeKotlinErrorType, builder: ProtoBuf.Type.Builder) {
|
||||
open fun serializeErrorType(type: ConeErrorType, builder: ProtoBuf.Type.Builder) {
|
||||
throw IllegalStateException("Cannot serialize error type: $type")
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -152,7 +152,7 @@ internal class KClassValue(value: Value) : ConstantValue<KClassValue.Value>(valu
|
||||
|
||||
companion object {
|
||||
fun create(argumentType: ConeKotlinType): ConstantValue<*>? {
|
||||
if (argumentType is ConeKotlinErrorType) return null
|
||||
if (argumentType is ConeErrorType) return null
|
||||
if (argumentType !is ConeClassLikeType) return null
|
||||
var type = argumentType
|
||||
var arrayDimensions = 0
|
||||
|
||||
Reference in New Issue
Block a user