[IR] remove type abbreviations
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AdapterGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AdapterGenerator.kt
index cf735ee..54bd33a 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AdapterGenerator.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AdapterGenerator.kt
@@ -366,7 +366,6 @@
parameterType.nullability,
listOf(makeTypeProjection(reifiedVarargElementType, Variance.OUT_VARIANCE)),
parameterType.annotations,
- parameterType.abbreviation
)
} else {
reifiedVarargElementType = valueParameter.varargElementType!!
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/actualizer/IrExpectActualMatchingContext.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/actualizer/IrExpectActualMatchingContext.kt
index 8ac7f10..c90bf507 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/actualizer/IrExpectActualMatchingContext.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/actualizer/IrExpectActualMatchingContext.kt
@@ -382,7 +382,6 @@
type.nullability,
newArguments,
type.annotations,
- type.abbreviation
)
}
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/ClosureAnnotator.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/ClosureAnnotator.kt
index 7487402..5287cb7 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/ClosureAnnotator.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/ClosureAnnotator.kt
@@ -154,9 +154,6 @@
type.arguments.forEach {
(it as? IrTypeProjection)?.type?.let(::seeType)
}
- type.abbreviation?.arguments?.forEach {
- (it as? IrTypeProjection)?.type?.let(::seeType)
- }
}
}
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrType.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrType.kt
index 89e1443..8d1b60b 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrType.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrType.kt
@@ -75,7 +75,6 @@
*/
abstract val nullability: SimpleTypeNullability
abstract val arguments: List<IrTypeArgument>
- abstract val abbreviation: IrTypeAbbreviation?
/**
* This property was deprecated and replaced with [nullability] property.
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/impl/IrSimpleTypeImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/impl/IrSimpleTypeImpl.kt
index fbcacb8..c5a5e9d 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/impl/IrSimpleTypeImpl.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/impl/IrSimpleTypeImpl.kt
@@ -23,7 +23,6 @@
abstract override val nullability: SimpleTypeNullability
abstract override val arguments: List<IrTypeArgument>
abstract override val annotations: List<IrConstructorCall>
- abstract override val abbreviation: IrTypeAbbreviation?
override fun equals(other: Any?): Boolean =
other is IrAbstractSimpleType &&
@@ -47,8 +46,6 @@
get() = delegate.nullability
override val arguments: List<IrTypeArgument>
get() = delegate.arguments
- override val abbreviation: IrTypeAbbreviation?
- get() = delegate.abbreviation
override val annotations: List<IrConstructorCall>
get() = delegate.annotations
}
@@ -59,7 +56,6 @@
nullability: SimpleTypeNullability,
override val arguments: List<IrTypeArgument>,
override val annotations: List<IrConstructorCall>,
- override val abbreviation: IrTypeAbbreviation? = null
) : IrAbstractSimpleType(kotlinType) {
override val nullability =
@@ -74,16 +70,14 @@
nullability: SimpleTypeNullability,
arguments: List<IrTypeArgument>,
annotations: List<IrConstructorCall>,
- abbreviation: IrTypeAbbreviation? = null
- ) : this(null, classifier, nullability, arguments, annotations, abbreviation)
+ ) : this(null, classifier, nullability, arguments, annotations)
constructor(
classifier: IrClassifierSymbol,
hasQuestionMark: Boolean,
arguments: List<IrTypeArgument>,
annotations: List<IrConstructorCall>,
- abbreviation: IrTypeAbbreviation? = null
- ) : this(null, classifier, SimpleTypeNullability.fromHasQuestionMark(hasQuestionMark), arguments, annotations, abbreviation)
+ ) : this(null, classifier, SimpleTypeNullability.fromHasQuestionMark(hasQuestionMark), arguments, annotations)
}
class IrSimpleTypeBuilder {
@@ -92,7 +86,6 @@
var nullability = SimpleTypeNullability.NOT_SPECIFIED
var arguments: List<IrTypeArgument> = emptyList()
var annotations: List<IrConstructorCall> = emptyList()
- var abbreviation: IrTypeAbbreviation? = null
var variance = Variance.INVARIANT
}
@@ -103,7 +96,6 @@
b.nullability = nullability
b.arguments = arguments
b.annotations = annotations
- b.abbreviation = abbreviation
}
fun IrSimpleTypeBuilder.buildSimpleType() =
@@ -113,7 +105,6 @@
nullability,
arguments.compactIfPossible(),
annotations.compactIfPossible(),
- abbreviation
)
fun IrSimpleTypeBuilder.buildTypeProjection() =
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/impl/IrTypeBase.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/impl/IrTypeBase.kt
index 7eb0fb3..a07ea68 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/impl/IrTypeBase.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/impl/IrTypeBase.kt
@@ -100,7 +100,6 @@
override val classifier: IrClassifierSymbol get() = error("Captured Type does not have a classifier")
override val arguments: List<IrTypeArgument> get() = emptyList()
- override val abbreviation: IrTypeAbbreviation? get () = null
override val nullability: SimpleTypeNullability get() = SimpleTypeNullability.DEFINITELY_NOT_NULL
override val annotations: List<IrConstructorCall> get() = emptyList()
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyTypeRemapper.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyTypeRemapper.kt
index 12d5ede..11f917c 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyTypeRemapper.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyTypeRemapper.kt
@@ -35,7 +35,6 @@
type.nullability,
type.arguments.memoryOptimizedMap { remapTypeArgument(it) },
type.annotations.memoryOptimizedMap { it.transform(deepCopy, null) as IrConstructorCall },
- type.abbreviation?.remapTypeAbbreviation()
)
else -> type
}
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrTypeParameterRemapper.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrTypeParameterRemapper.kt
index 621f1af..3561793 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrTypeParameterRemapper.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrTypeParameterRemapper.kt
@@ -34,7 +34,6 @@
type.nullability,
type.arguments.memoryOptimizedMap { it.remap() },
type.annotations,
- type.abbreviation?.remap()
).apply {
annotations.forEach { it.remapTypes(this@IrTypeParameterRemapper) }
}
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt
index 0117775..5ebf5db 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt
@@ -783,9 +783,6 @@
} else if (isMarkedNullable()) {
append('?')
}
- abbreviation?.let {
- append(it.renderTypeAbbreviation(renderer, options))
- }
}
else -> "{${javaClass.simpleName} $this}"
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SimpleTypeRemapper.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SimpleTypeRemapper.kt
index 3c32f28..dcb9024 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SimpleTypeRemapper.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SimpleTypeRemapper.kt
@@ -37,7 +37,6 @@
type.nullability,
arguments,
type.annotations,
- type.abbreviation?.remapTypeAbbreviation()
)
}
}
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt
index 487402f..94e6d0a 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt
@@ -127,7 +127,6 @@
this.kotlinType = approximatedType
this.nullability = SimpleTypeNullability.fromHasQuestionMark(upperType.isMarkedNullable)
this.variance = variance
- this.abbreviation = upperType.getAbbreviation()?.toIrTypeAbbreviation()
when (upperTypeDescriptor) {
is TypeParameterDescriptor -> {
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/linkage/partial/PartiallyLinkedMarkerType.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/linkage/partial/PartiallyLinkedMarkerType.kt
index 2079649..429c131 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/linkage/partial/PartiallyLinkedMarkerType.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/linkage/partial/PartiallyLinkedMarkerType.kt
@@ -23,7 +23,6 @@
override val classifier = builtIns.anyClass
override val nullability get() = SimpleTypeNullability.MARKED_NULLABLE
override val arguments get() = emptyList<IrTypeArgument>()
- override val abbreviation: IrTypeAbbreviation? get() = null
override val variance get() = Variance.INVARIANT
override fun equals(other: Any?) = (other as? PartiallyLinkedMarkerType)?.unusableClassifier == unusableClassifier
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrDeclarationDeserializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrDeclarationDeserializer.kt
index f425605..4d85e46 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrDeclarationDeserializer.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrDeclarationDeserializer.kt
@@ -126,7 +126,6 @@
val arguments = proto.argumentList.memoryOptimizedMap { deserializeIrTypeArgument(it) }
val annotations = deserializeAnnotations(proto.annotationList)
- val abbreviation = if (proto.hasAbbreviation()) deserializeTypeAbbreviation(proto.abbreviation) else null
return IrSimpleTypeImpl(
null,
@@ -134,7 +133,6 @@
deserializeSimpleTypeNullability(proto.nullability),
arguments,
annotations,
- abbreviation
)
}
@@ -144,7 +142,6 @@
val arguments = proto.argumentList.memoryOptimizedMap { deserializeIrTypeArgument(it) }
val annotations = deserializeAnnotations(proto.annotationList)
- val abbreviation = if (proto.hasAbbreviation()) deserializeTypeAbbreviation(proto.abbreviation) else null
return IrSimpleTypeImpl(
null,
@@ -152,7 +149,6 @@
SimpleTypeNullability.fromHasQuestionMark(proto.hasQuestionMark),
arguments,
annotations,
- abbreviation
)
}
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt
index 5eff12e..c6a97ed 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt
@@ -393,9 +393,6 @@
if (type.nullability != SimpleTypeNullability.NOT_SPECIFIED) {
proto.setNullability(serializeNullability(type.nullability))
}
- type.abbreviation?.let { ta ->
- proto.setAbbreviation(serializeIrTypeAbbreviation(ta))
- }
type.arguments.forEach {
proto.addArgument(serializeTypeArgument(it))
}
@@ -454,7 +451,6 @@
val nullability: SimpleTypeNullability?,
val arguments: List<IrTypeArgumentKey>?,
val annotations: List<IrConstructorCall>,
- val abbreviation: IrTypeAbbreviation?
)
data class IrTypeArgumentKey(
@@ -477,7 +473,6 @@
nullability = (type as? IrSimpleType)?.nullability,
arguments = (type as? IrSimpleType)?.arguments?.map { it.toIrTypeArgumentKey },
annotations = type.annotations,
- abbreviation = (type as? IrSimpleType)?.abbreviation
)
}
diff --git a/plugins/fir-plugin-prototype/src/org/jetbrains/kotlin/ir/plugin/ComposableFunctionsTransformer.kt b/plugins/fir-plugin-prototype/src/org/jetbrains/kotlin/ir/plugin/ComposableFunctionsTransformer.kt
index a5dec14..a0f8904 100644
--- a/plugins/fir-plugin-prototype/src/org/jetbrains/kotlin/ir/plugin/ComposableFunctionsTransformer.kt
+++ b/plugins/fir-plugin-prototype/src/org/jetbrains/kotlin/ir/plugin/ComposableFunctionsTransformer.kt
@@ -91,7 +91,6 @@
type.nullability,
newArguments,
type.annotations,
- type.abbreviation
)
}
