IR: annotations are represented as IrConstructorCall elements

Also, they are rendered somewhat nicer

compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/descriptors/WrappedDescriptors.kt

@@ -48,8 +48,8 @@ abstract class WrappedDeclarationDescriptor<T : IrDeclaration>(annotations: Anno
         Annotations.create(ownerAnnotations.map { it.toAnnotationDescriptor() })
     }
 
-    private fun IrCall.toAnnotationDescriptor(): AnnotationDescriptor {
-        assert(symbol.owner is IrConstructor && symbol.owner.parentAsClass.isAnnotationClass) {
+    private fun IrConstructorCall.toAnnotationDescriptor(): AnnotationDescriptor {
+        assert(symbol.owner.parentAsClass.isAnnotationClass) {
             "Expected call to constructor of annotation class but was: ${this.dump()}"
         }
         return AnnotationDescriptorImpl(
@@ -88,7 +88,7 @@ abstract class WrappedDeclarationDescriptor<T : IrDeclaration>(annotations: Anno
 
             this is IrClassReference -> KClassValue(classType.classifierOrFail.descriptor.classId!!, /*TODO*/0)
 
-            this is IrCall -> AnnotationValue(this.toAnnotationDescriptor())
+            this is IrConstructorCall -> AnnotationValue(this.toAnnotationDescriptor())
 
             else -> error("$this is not expected: ${this.dump()}")
         }

compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/CallGenerator.kt

@@ -246,18 +246,11 @@ class CallGenerator(statementGenerator: StatementGenerator) : StatementGenerator
     ): IrExpression =
         call.callReceiver.call { dispatchReceiverValue, extensionReceiverValue ->
             val irType = constructorDescriptor.returnType.toIrType()
-            val classTypeParametersCount = constructorDescriptor.constructedClass.original.declaredTypeParameters.size
-            val totalTypeParametersCount = constructorDescriptor.typeParameters.size
-
-            IrConstructorCallImpl(
+            IrConstructorCallImpl.fromSymbolDescriptor(
                 startOffset, endOffset,
                 irType,
                 context.symbolTable.referenceConstructor(constructorDescriptor.original),
-                constructorDescriptor,
-                typeArgumentsCount = totalTypeParametersCount,
-                constructorTypeArgumentsCount = totalTypeParametersCount - classTypeParametersCount,
-                valueArgumentsCount = constructorDescriptor.valueParameters.size,
-                origin = origin
+                origin
             ).run {
                 putTypeArguments(call.typeArguments) { it.toIrType() }
                 dispatchReceiver = dispatchReceiverValue?.load()

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrAnnotationContainer.kt

@@ -5,8 +5,8 @@
 
 package org.jetbrains.kotlin.ir.declarations
 
-import org.jetbrains.kotlin.ir.expressions.IrCall
+import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 
 interface IrAnnotationContainer {
-    val annotations: MutableList<IrCall>
+    val annotations: MutableList<IrConstructorCall>
 }

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrDeclarationBase.kt

@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent
 import org.jetbrains.kotlin.ir.declarations.MetadataSource
 import org.jetbrains.kotlin.ir.expressions.IrCall
+import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 
 abstract class IrDeclarationBase(
     startOffset: Int,
@@ -32,7 +33,7 @@ abstract class IrDeclarationBase(
 
     override lateinit var parent: IrDeclarationParent
 
-    override val annotations: MutableList<IrCall> = ArrayList()
+    override val annotations: MutableList<IrConstructorCall> = ArrayList()
 
     override val metadata: MetadataSource?
         get() = null

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFileImpl.kt

@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.ir.SourceManager
 import org.jetbrains.kotlin.ir.declarations.IrDeclaration
 import org.jetbrains.kotlin.ir.declarations.IrFile
 import org.jetbrains.kotlin.ir.declarations.MetadataSource
-import org.jetbrains.kotlin.ir.expressions.IrCall
+import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.symbols.IrFileSymbol
 import org.jetbrains.kotlin.ir.symbols.impl.IrFileSymbolImpl
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
@@ -55,7 +55,7 @@ class IrFileImpl(
 
     override val declarations: MutableList<IrDeclaration> = ArrayList()
 
-    override val annotations: MutableList<IrCall> = ArrayList()
+    override val annotations: MutableList<IrConstructorCall> = ArrayList()
 
     override var metadata: MetadataSource.File? = null
 

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyDeclarationBase.kt

@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.ir.declarations.IrValueParameter
 import org.jetbrains.kotlin.ir.declarations.impl.IrDeclarationBase
 import org.jetbrains.kotlin.ir.declarations.impl.IrValueParameterImpl
 import org.jetbrains.kotlin.ir.expressions.IrCall
+import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.util.DeclarationStubGenerator
 import org.jetbrains.kotlin.ir.util.TypeTranslator
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
@@ -50,7 +51,7 @@ abstract class IrLazyDeclarationBase(
         createLazyParent()!!
     }
 
-    override val annotations: MutableList<IrCall> by lazy {
+    override val annotations: MutableList<IrConstructorCall> by lazy {
         descriptor.annotations.map {
             typeTranslator.constantValueGenerator.generateAnnotationConstructorCall(it)
         }.toMutableList()

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrCallImpl.kt

@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.ir.expressions.impl
 
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.descriptors.ConstructorDescriptor
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrCall
 import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin
@@ -45,6 +46,12 @@ class IrCallImpl(
     ),
     IrCall {
 
+    init {
+        if (symbol is IrClassSymbol) {
+            throw AssertionError("Should be IrConstructorCall: $descriptor")
+        }
+    }
+
     constructor(
         startOffset: Int,
         endOffset: Int,

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrConstructorCallImpl.kt

@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.ir.expressions.impl
 
 import org.jetbrains.kotlin.descriptors.ClassConstructorDescriptor
+import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin
 import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol
@@ -28,4 +29,52 @@ class IrConstructorCallImpl(
 
     override fun <R, D> accept(visitor: IrElementVisitor<R, D>, data: D): R =
         visitor.visitConstructorCall(this, data)
-}
+
+    companion object {
+        fun fromSymbolDescriptor(
+            startOffset: Int,
+            endOffset: Int,
+            type: IrType,
+            constructorSymbol: IrConstructorSymbol,
+            origin: IrStatementOrigin? = null
+        ): IrConstructorCallImpl {
+            val constructorDescriptor = constructorSymbol.descriptor
+            val classTypeParametersCount = constructorDescriptor.constructedClass.original.declaredTypeParameters.size
+            val totalTypeParametersCount = constructorDescriptor.typeParameters.size
+            val valueParametersCount = constructorDescriptor.valueParameters.size
+
+            return IrConstructorCallImpl(
+                startOffset, endOffset,
+                type,
+                constructorSymbol,
+                constructorDescriptor,
+                totalTypeParametersCount,
+                totalTypeParametersCount - classTypeParametersCount,
+                valueParametersCount,
+                origin
+            )
+        }
+
+        fun fromSymbolDescriptor(
+            type: IrType,
+            constructorSymbol: IrConstructorSymbol,
+            origin: IrStatementOrigin? = null
+        ): IrConstructorCallImpl {
+            val constructorDescriptor = constructorSymbol.descriptor
+            val classTypeParametersCount = constructorDescriptor.constructedClass.original.declaredTypeParameters.size
+            val totalTypeParametersCount = constructorDescriptor.typeParameters.size
+            val valueParametersCount = constructorDescriptor.valueParameters.size
+
+            return IrConstructorCallImpl(
+                UNDEFINED_OFFSET, UNDEFINED_OFFSET,
+                type,
+                constructorSymbol, constructorDescriptor,
+                totalTypeParametersCount,
+                totalTypeParametersCount - classTypeParametersCount,
+                valueParametersCount,
+                origin
+            )
+        }
+    }
+}
+

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrType.kt

@@ -5,12 +5,12 @@
 
 package org.jetbrains.kotlin.ir.types
 
-import org.jetbrains.kotlin.ir.expressions.IrCall
+import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol
 import org.jetbrains.kotlin.types.Variance
 
 interface IrType {
-    val annotations: List<IrCall>
+    val annotations: List<IrConstructorCall>
 
     /**
      * @return true if this type is equal to [other] symbolically. Note that this is NOT EQUIVALENT to the full type checking algorithm
@@ -46,4 +46,4 @@ interface IrStarProjection : IrTypeArgument
 interface IrTypeProjection : IrTypeArgument {
     val variance: Variance
     val type: IrType
-}
+}

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/impl/IrSimpleTypeImpl.kt

@@ -5,7 +5,7 @@
 
 package org.jetbrains.kotlin.ir.types.impl
 
-import org.jetbrains.kotlin.ir.expressions.IrCall
+import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.symbols.FqNameEqualityChecker
 import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol
 import org.jetbrains.kotlin.ir.types.*
@@ -17,14 +17,14 @@ class IrSimpleTypeImpl(
     override val classifier: IrClassifierSymbol,
     override val hasQuestionMark: Boolean,
     override val arguments: List<IrTypeArgument>,
-    annotations: List<IrCall>
+    annotations: List<IrConstructorCall>
 ) : IrTypeBase(kotlinType, annotations, Variance.INVARIANT), IrSimpleType, IrTypeProjection {
 
     constructor(
         classifier: IrClassifierSymbol,
         hasQuestionMark: Boolean,
         arguments: List<IrTypeArgument>,
-        annotations: List<IrCall>
+        annotations: List<IrConstructorCall>
     ) : this(null, classifier, hasQuestionMark, arguments, annotations)
 
     override fun equals(other: Any?): Boolean =

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/impl/IrTypeBase.kt

@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.ir.types.impl
 
 import org.jetbrains.kotlin.ir.expressions.IrCall
+import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.types.*
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.Variance
@@ -13,7 +14,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
 abstract class IrTypeBase(
     val kotlinType: KotlinType?,
-    override val annotations: List<IrCall>,
+    override val annotations: List<IrConstructorCall>,
     override val variance: Variance
 ) : IrType, IrTypeProjection {
     override val type: IrType get() = this
@@ -21,7 +22,7 @@ abstract class IrTypeBase(
 
 class IrErrorTypeImpl(
     kotlinType: KotlinType?,
-    annotations: List<IrCall>,
+    annotations: List<IrConstructorCall>,
     variance: Variance
 ) : IrTypeBase(kotlinType, annotations, variance), IrErrorType {
     override fun equals(other: Any?): Boolean = other is IrErrorTypeImpl
@@ -31,7 +32,7 @@ class IrErrorTypeImpl(
 
 class IrDynamicTypeImpl(
     kotlinType: KotlinType?,
-    annotations: List<IrCall>,
+    annotations: List<IrConstructorCall>,
     variance: Variance
 ) : IrTypeBase(kotlinType, annotations, variance), IrDynamicType, IrTypeProjection {
     override fun equals(other: Any?): Boolean = other is IrDynamicTypeImpl
@@ -52,7 +53,7 @@ object IrStarProjectionImpl : IrStarProjection {
 
 @Deprecated("Hack to temporary cover late type initialization")
 object IrUninitializedType : IrType {
-    override val annotations: List<IrCall> = emptyList()
+    override val annotations: List<IrConstructorCall> = emptyList()
 
     override fun equals(other: Any?): Boolean = this === other
 

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/AdditionalIrUtils.kt

@@ -5,11 +5,12 @@
 
 package org.jetbrains.kotlin.ir.util
 
+import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.ir.SourceManager
 import org.jetbrains.kotlin.ir.SourceRangeInfo
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.ir.expressions.IrCall
+import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
@@ -74,15 +75,15 @@ fun IrSimpleFunction.overrides(other: IrSimpleFunction): Boolean {
     return false
 }
 
-private val IrCall.annotationClass
-    get() = (this.symbol.owner as IrConstructor).constructedClass
+private val IrConstructorCall.annotationClass
+    get() = this.symbol.owner.constructedClass
 
-fun List<IrCall>.hasAnnotation(fqName: FqName): Boolean =
-    this.any { it.annotationClass.fqNameSafe == fqName }
+fun List<IrConstructorCall>.hasAnnotation(fqName: FqName): Boolean =
+    any { it.annotationClass.fqNameSafe == fqName }
+
+fun List<IrConstructorCall>.findAnnotation(fqName: FqName): IrConstructorCall? =
+    firstOrNull { it.annotationClass.fqNameSafe == fqName }
 
-fun List<IrCall>.findAnnotation(fqName: FqName): IrCall? = this.firstOrNull {
-    it.annotationClass.fqNameSafe == fqName
-}
 val IrDeclaration.fileEntry: SourceManager.FileEntry
     get() = parent.let {
         when (it) {

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/ConstantValueGenerator.kt

@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.expressions.IrCall
+import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.types.classifierOrFail
@@ -19,7 +20,6 @@ import org.jetbrains.kotlin.psi.psiUtil.startOffset
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.constants.*
 import org.jetbrains.kotlin.resolve.source.PsiSourceElement
-import org.jetbrains.kotlin.resolve.source.PsiSourceFile
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.typeUtil.builtIns
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
@@ -73,7 +73,7 @@ class ConstantValueGenerator(
             is EnumValue -> {
                 val enumEntryDescriptor =
                     constantKtType.memberScope.getContributedClassifier(constantValue.enumEntryName, NoLookupLocation.FROM_BACKEND)
-                            ?: throw AssertionError("No such enum entry ${constantValue.enumEntryName} in $constantType")
+                        ?: throw AssertionError("No such enum entry ${constantValue.enumEntryName} in $constantType")
                 if (enumEntryDescriptor !is ClassDescriptor) {
                     throw AssertionError("Enum entry $enumEntryDescriptor should be a ClassDescriptor")
                 }
@@ -89,7 +89,7 @@ class ConstantValueGenerator(
             is KClassValue -> {
                 val classifierKtType = constantValue.getArgumentType(moduleDescriptor)
                 val classifierDescriptor = classifierKtType.constructor.declarationDescriptor
-                        ?: throw AssertionError("Unexpected KClassValue: $classifierKtType")
+                    ?: throw AssertionError("Unexpected KClassValue: $classifierKtType")
 
                 IrClassReferenceImpl(
                     startOffset, endOffset,
@@ -103,29 +103,28 @@ class ConstantValueGenerator(
         }
     }
 
-    fun generateAnnotationConstructorCall(annotationDescriptor: AnnotationDescriptor): IrCall {
+    fun generateAnnotationConstructorCall(annotationDescriptor: AnnotationDescriptor): IrConstructorCall {
         val annotationType = annotationDescriptor.type
         val annotationClassDescriptor = annotationType.constructor.declarationDescriptor as? ClassDescriptor
-                ?: throw AssertionError("No declaration descriptor for annotation $annotationDescriptor")
+            ?: throw AssertionError("No declaration descriptor for annotation $annotationDescriptor")
 
         assert(DescriptorUtils.isAnnotationClass(annotationClassDescriptor)) {
             "Annotation class expected: $annotationClassDescriptor"
         }
 
         val primaryConstructorDescriptor = annotationClassDescriptor.unsubstitutedPrimaryConstructor
-                ?: annotationClassDescriptor.constructors.singleOrNull()
-                ?: throw AssertionError("No constructor for annotation class $annotationClassDescriptor")
+            ?: annotationClassDescriptor.constructors.singleOrNull()
+            ?: throw AssertionError("No constructor for annotation class $annotationClassDescriptor")
         val primaryConstructorSymbol = symbolTable.referenceConstructor(primaryConstructorDescriptor)
 
         val psi = annotationDescriptor.source.safeAs<PsiSourceElement>()?.psi
         val startOffset = psi?.takeUnless { it.containingFile.fileType.isBinary }?.startOffset ?: UNDEFINED_OFFSET
         val endOffset = psi?.takeUnless { it.containingFile.fileType.isBinary }?.endOffset ?: UNDEFINED_OFFSET
 
-        val irCall = IrCallImpl(
+        val irCall = IrConstructorCallImpl.fromSymbolDescriptor(
             startOffset, endOffset,
             annotationType.toIrType(),
-            primaryConstructorSymbol, primaryConstructorDescriptor,
-            typeArgumentsCount = 0
+            primaryConstructorSymbol
         )
 
         for (valueParameter in primaryConstructorDescriptor.valueParameters) {

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyTypeRemapper.kt

@@ -6,7 +6,7 @@
 package org.jetbrains.kotlin.ir.util
 
 import org.jetbrains.kotlin.ir.declarations.IrTypeParametersContainer
-import org.jetbrains.kotlin.ir.expressions.IrCall
+import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.types.IrSimpleType
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.IrTypeProjection
@@ -39,14 +39,15 @@ class DeepCopyTypeRemapper(
             }
         }
 
-        val annotations = type.annotations.map { it.transform(deepCopy, null) as IrCall }
+        val annotations = type.annotations.map { it.transform(deepCopy, null) as IrConstructorCall }
 
         return IrSimpleTypeImpl(
             null,
             symbolRemapper.getReferencedClassifier(type.classifier),
             type.hasQuestionMark,
             arguments,
-            annotations)
+            annotations
+        )
     }
 
 }

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt

@@ -99,8 +99,8 @@ class DumpIrTreeVisitor(
     }
 
     private fun dumpAnnotations(element: IrAnnotationContainer) {
-        element.annotations.dumpItems("annotations") {
-            element.annotations.dumpElements()
+        element.annotations.dumpItems("annotations") { irAnnotation: IrConstructorCall ->
+            printer.println(elementRenderer.renderAsAnnotation(irAnnotation))
         }
     }
 
@@ -164,7 +164,7 @@ class DumpIrTreeVisitor(
             dumpTypeArguments(expression)
             expression.dispatchReceiver?.accept(this, "\$this")
             expression.extensionReceiver?.accept(this, "\$receiver")
-            val valueParameterNames = expression.getValueParameterNames(expression.valueArgumentsCount)
+            val valueParameterNames = expression.getValueParameterNamesForDebug()
             for (index in 0 until expression.valueArgumentsCount) {
                 expression.getValueArgument(index)?.accept(this, valueParameterNames[index])
             }
@@ -175,10 +175,14 @@ class DumpIrTreeVisitor(
         expression.dumpLabeledElementWith(data) {
             dumpTypeArguments(expression)
             expression.outerClassReceiver?.accept(this, "\$outer")
-            val valueParameterNames = expression.getValueParameterNames(expression.valueArgumentsCount)
-            for (index in 0 until expression.valueArgumentsCount) {
-                expression.getValueArgument(index)?.accept(this, valueParameterNames[index])
-            }
+            dumpConstructorValueArguments(expression)
+        }
+    }
+
+    private fun dumpConstructorValueArguments(expression: IrConstructorCall) {
+        val valueParameterNames = expression.getValueParameterNamesForDebug()
+        for (index in 0 until expression.valueArgumentsCount) {
+            expression.getValueArgument(index)?.accept(this, valueParameterNames[index])
         }
     }
 
@@ -208,15 +212,6 @@ class DumpIrTreeVisitor(
         else
             getPlaceholderParameterNames(expectedCount)
 
-    private fun IrMemberAccessExpression.getValueParameterNames(expectedCount: Int): List<String> =
-        if (this is IrDeclarationReference && symbol.isBound)
-            symbol.owner.getValueParameterNames(expectedCount)
-        else
-            getPlaceholderParameterNames(expectedCount)
-
-    private fun getPlaceholderParameterNames(expectedCount: Int) =
-        (1..expectedCount).map { "$it" }
-
     private fun IrSymbolOwner.getTypeParameterNames(expectedCount: Int): List<String> =
         if (this is IrTypeParametersContainer) {
             val typeParameters = if (this is IrConstructor) getFullTypeParametersList() else this.typeParameters
@@ -230,18 +225,6 @@ class DumpIrTreeVisitor(
             getPlaceholderParameterNames(expectedCount)
         }
 
-    private fun IrSymbolOwner.getValueParameterNames(expectedCount: Int): List<String> =
-        if (this is IrFunction) {
-            (0 until expectedCount).map {
-                if (it < valueParameters.size)
-                    valueParameters[it].name.asString()
-                else
-                    "${it + 1}"
-            }
-        } else {
-            getPlaceholderParameterNames(expectedCount)
-        }
-
     private fun IrConstructor.getFullTypeParametersList(): List<IrTypeParameter> {
         val parentClass = try {
             parent as? IrClass ?: return typeParameters
@@ -378,3 +361,24 @@ class DumpTreeFromSourceLineVisitor(
         element.acceptChildrenVoid(this)
     }
 }
+
+internal fun IrMemberAccessExpression.getValueParameterNamesForDebug(): List<String> {
+    val expectedCount = valueArgumentsCount
+    return if (this is IrDeclarationReference && symbol.isBound) {
+        val owner = symbol.owner
+        if (owner is IrFunction) {
+            (0 until expectedCount).map {
+                if (it < owner.valueParameters.size)
+                    owner.valueParameters[it].name.asString()
+                else
+                    "${it + 1}"
+            }
+        } else {
+            getPlaceholderParameterNames(expectedCount)
+        }
+    } else
+        getPlaceholderParameterNames(expectedCount)
+}
+
+internal fun getPlaceholderParameterNames(expectedCount: Int) =
+    (1..expectedCount).map { "$it" }

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt

@@ -299,7 +299,7 @@ tailrec fun IrElement.getPackageFragment(): IrPackageFragment? {
     }
 }
 
-fun IrAnnotationContainer.getAnnotation(name: FqName) =
+fun IrAnnotationContainer.getAnnotation(name: FqName): IrConstructorCall? =
     annotations.find {
         it.symbol.owner.parentAsClass.descriptor.fqNameSafe == name
     }

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt

@@ -39,6 +39,53 @@ class RenderIrElementVisitor : IrElementVisitor<String, Nothing?> {
 
     fun renderSymbolReference(symbol: IrSymbol) = symbol.renderReference()
 
+    fun renderAsAnnotation(irAnnotation: IrConstructorCall): String =
+        StringBuilder().also { it.renderAsAnnotation(irAnnotation) }.toString()
+
+    private fun StringBuilder.renderAsAnnotation(irAnnotation: IrConstructorCall) {
+        val annotationClassName = try {
+            irAnnotation.symbol.owner.parentAsClass.name.asString()
+        } catch (e: Exception) {
+            "<unbound>"
+        }
+        append(annotationClassName)
+
+        if (irAnnotation.valueArgumentsCount == 0) return
+
+        val valueParameterNames = irAnnotation.getValueParameterNamesForDebug()
+        var first = true
+        append("(")
+        for (i in 0 until irAnnotation.valueArgumentsCount) {
+            if (first) {
+                first = false
+            } else {
+                append(", ")
+            }
+            append(valueParameterNames[i])
+            append(" = ")
+            renderAsAnnotationArgument(irAnnotation.getValueArgument(i))
+        }
+        append(")")
+    }
+
+    private fun StringBuilder.renderAsAnnotationArgument(irElement: IrElement?) {
+        when (irElement) {
+            null -> append("<null>")
+            is IrConstructorCall -> renderAsAnnotation(irElement)
+            is IrConst<*> -> {
+                append('\'')
+                append(irElement.value.toString())
+                append('\'')
+            }
+            is IrVararg -> {
+                appendListWith(irElement.elements, "[", "]", ", ") {
+                    renderAsAnnotationArgument(it)
+                }
+            }
+            else -> append(irElement.accept(this@RenderIrElementVisitor, null))
+        }
+    }
+
     private inline fun buildTrimEnd(fn: StringBuilder.() -> Unit): String =
         buildString(fn).trimEnd()
 
@@ -82,11 +129,11 @@ class RenderIrElementVisitor : IrElementVisitor<String, Nothing?> {
         }
 
 
-    private fun renderTypeAnnotations(annotations: List<IrCall>) =
+    private fun renderTypeAnnotations(annotations: List<IrConstructorCall>) =
         if (annotations.isEmpty())
             ""
         else
-            annotations.joinToString(prefix = "", postfix = " ", separator = " ") { "@[${it.render()}]" }
+            annotations.joinToString(prefix = "", postfix = " ", separator = " ") { "@[${renderAsAnnotation(it)}]" }
 
     private fun IrSymbol.renderReference() =
         if (isBound)

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt

@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.ir.declarations.IrTypeParametersContainer
 import org.jetbrains.kotlin.ir.expressions.IrCall
+import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.IrTypeProjection
 import org.jetbrains.kotlin.ir.types.impl.*
@@ -131,7 +132,7 @@ class TypeTranslator(
     }
 
 
-    private fun translateTypeAnnotations(annotations: Annotations): List<IrCall> =
+    private fun translateTypeAnnotations(annotations: Annotations): List<IrConstructorCall> =
         annotations.map(constantValueGenerator::generateAnnotationConstructorCall)
 
     private fun translateTypeArguments(arguments: List<TypeProjection>) =

compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt

@@ -83,9 +83,9 @@ abstract class IrModuleDeserializer(
 
     }
 
-    fun deserializeAnnotations(annotations: KotlinIr.Annotations): List<IrCall> {
+    fun deserializeAnnotations(annotations: KotlinIr.Annotations): List<IrConstructorCall> {
         return annotations.annotationList.map {
-            deserializeCall(it, 0, 0, builtIns.unitType) // TODO: need a proper deserialization here
+            deserializeConstructorCall(it, 0, 0, builtIns.unitType) // TODO: need a proper deserialization here
         }
     }
 
@@ -243,6 +243,19 @@ abstract class IrModuleDeserializer(
         return IrClassReferenceImpl(start, end, type, symbol, classType)
     }
 
+    private fun deserializeConstructorCall(proto: KotlinIr.IrConstructorCall, start: Int, end: Int, type: IrType): IrConstructorCall {
+        val symbol = deserializeIrSymbol(proto.symbol) as IrConstructorSymbol
+        return IrConstructorCallImpl(
+            start, end, type,
+            symbol, symbol.descriptor,
+            typeArgumentsCount = proto.memberAccess.typeArguments.typeArgumentCount,
+            constructorTypeArgumentsCount = proto.constructorTypeArgumentsCount,
+            valueArgumentsCount = proto.memberAccess.valueArgumentCount
+        ).also {
+            deserializeMemberAccessCommon(it, proto.memberAccess)
+        }
+    }
+
     private fun deserializeCall(proto: KotlinIr.IrCall, start: Int, end: Int, type: IrType): IrCall {
         val symbol = deserializeIrSymbol(proto.symbol) as IrFunctionSymbol
 
@@ -415,11 +428,11 @@ abstract class IrModuleDeserializer(
         val getter = if (proto.hasGetter()) deserializeIrSymbol(proto.getter) as IrSimpleFunctionSymbol else null
         val setter = if (proto.hasSetter()) deserializeIrSymbol(proto.setter) as IrSimpleFunctionSymbol else null
         val descriptor =
-        if (proto.hasDescriptorReference())
-            deserializeDescriptorReference(proto.descriptorReference) as PropertyDescriptor
-        else
-            field?.descriptor as? WrappedPropertyDescriptor // If field's descriptor coincides with property's.
-                ?: getterToPropertyDescriptorMap.getOrPut(getter!!) { WrappedPropertyDescriptor() }
+            if (proto.hasDescriptorReference())
+                deserializeDescriptorReference(proto.descriptorReference) as PropertyDescriptor
+            else
+                field?.descriptor as? WrappedPropertyDescriptor // If field's descriptor coincides with property's.
+                    ?: getterToPropertyDescriptorMap.getOrPut(getter!!) { WrappedPropertyDescriptor() }
 
         val callable = IrPropertyReferenceImpl(
             start, end, type,
@@ -573,10 +586,10 @@ abstract class IrModuleDeserializer(
     // we create the loop before deserializing the body, so that
     // IrBreak statements have something to put into 'loop' field.
     private fun deserializeDoWhile(proto: KotlinIr.IrDoWhile, start: Int, end: Int, type: IrType) =
-            deserializeLoop(proto.loop, deserializeLoopHeader(proto.loop.loopId) { IrDoWhileLoopImpl(start, end, type, null) })
+        deserializeLoop(proto.loop, deserializeLoopHeader(proto.loop.loopId) { IrDoWhileLoopImpl(start, end, type, null) })
 
     private fun deserializeWhile(proto: KotlinIr.IrWhile, start: Int, end: Int, type: IrType) =
-            deserializeLoop(proto.loop, deserializeLoopHeader(proto.loop.loopId) { IrWhileLoopImpl(start, end, type, null) })
+        deserializeLoop(proto.loop, deserializeLoopHeader(proto.loop.loopId) { IrWhileLoopImpl(start, end, type, null) })
 
     private fun deserializeDynamicMemberExpression(proto: KotlinIr.IrDynamicMemberExpression, start: Int, end: Int, type: IrType) =
         IrDynamicMemberExpressionImpl(start, end, type, deserializeString(proto.memberName), deserializeExpression(proto.receiver))
@@ -741,6 +754,8 @@ abstract class IrModuleDeserializer(
             -> deserializeDynamicMemberExpression(proto.dynamicMember, start, end, type)
             DYNAMIC_OPERATOR
             -> deserializeDynamicOperatorExpression(proto.dynamicOperator, start, end, type)
+            CONSTRUCTOR_CALL
+            -> deserializeConstructorCall(proto.constructorCall, start, end, type)
             OPERATION_NOT_SET
             -> error("Expression deserialization not implemented: ${proto.operationCase}")
         }
@@ -834,20 +849,22 @@ abstract class IrModuleDeserializer(
         val symbol = deserializeIrSymbol(proto.symbol) as IrClassSymbol
 
         val modality = deserializeModality(proto.modality)
-        val clazz = symbolTable.declareClass(UNDEFINED_OFFSET, UNDEFINED_OFFSET, irrelevantOrigin,
-            symbol.descriptor, modality) {
+        val clazz = symbolTable.declareClass(
+            UNDEFINED_OFFSET, UNDEFINED_OFFSET, irrelevantOrigin,
+            symbol.descriptor, modality
+        ) {
             IrClassImpl(
-                        start, end, origin,
-                        it,
-                        deserializeName(proto.name),
-                        deserializeClassKind(proto.kind),
-                        deserializeVisibility(proto.visibility),
-                        modality,
-                        proto.isCompanion,
-                        proto.isInner,
-                        proto.isData,
-                        proto.isExternal,
-                        proto.isInline
+                start, end, origin,
+                it,
+                deserializeName(proto.name),
+                deserializeClassKind(proto.kind),
+                deserializeVisibility(proto.visibility),
+                modality,
+                proto.isCompanion,
+                proto.isInner,
+                proto.isData,
+                proto.isExternal,
+                proto.isInline
             )
         }
 
@@ -901,19 +918,19 @@ abstract class IrModuleDeserializer(
         val symbol = deserializeIrSymbol(proto.symbol) as IrSimpleFunctionSymbol
 
         val function = symbolTable.declareSimpleFunction(UNDEFINED_OFFSET, UNDEFINED_OFFSET, irrelevantOrigin,
-            symbol.descriptor, {
-                IrFunctionImpl(
-                    start, end, origin, it,
-                    deserializeName(proto.base.name),
-                    deserializeVisibility(proto.base.visibility),
-                    deserializeModality(proto.modality),
-                    deserializeIrType(proto.base.returnType),
-                    proto.base.isInline,
-                    proto.base.isExternal,
-                    proto.isTailrec,
-                    proto.isSuspend
-                )
-            })
+                                                         symbol.descriptor, {
+                                                             IrFunctionImpl(
+                                                                 start, end, origin, it,
+                                                                 deserializeName(proto.base.name),
+                                                                 deserializeVisibility(proto.base.visibility),
+                                                                 deserializeModality(proto.modality),
+                                                                 deserializeIrType(proto.base.returnType),
+                                                                 proto.base.isInline,
+                                                                 proto.base.isExternal,
+                                                                 proto.isTailrec,
+                                                                 proto.isSuspend
+                                                             )
+                                                         })
 
         deserializeIrFunctionBase(proto.base, function as IrFunctionBase, start, end, origin)
         val overridden = proto.overriddenList.map { deserializeIrSymbol(it) as IrSimpleFunctionSymbol }
@@ -1010,19 +1027,19 @@ abstract class IrModuleDeserializer(
         val symbol = deserializeIrSymbol(proto.symbol) as IrConstructorSymbol
 
         val constructor = symbolTable.declareConstructor(UNDEFINED_OFFSET, UNDEFINED_OFFSET, irrelevantOrigin,
-            symbol.descriptor, {
-                IrConstructorImpl(
-                    start, end, origin,
-                    it,
-                    deserializeName(proto.base.name),
-                    deserializeVisibility(proto.base.visibility),
-                    deserializeIrType(proto.base.returnType),
-                    proto.base.isInline,
-                    proto.base.isExternal,
-                    proto.isPrimary
-                )
+                                                         symbol.descriptor, {
+                                                             IrConstructorImpl(
+                                                                 start, end, origin,
+                                                                 it,
+                                                                 deserializeName(proto.base.name),
+                                                                 deserializeVisibility(proto.base.visibility),
+                                                                 deserializeIrType(proto.base.returnType),
+                                                                 proto.base.isInline,
+                                                                 proto.base.isExternal,
+                                                                 proto.isPrimary
+                                                             )
 
-            })
+                                                         })
 
         deserializeIrFunctionBase(proto.base, constructor as IrFunctionBase, start, end, origin)
         return constructor
@@ -1033,21 +1050,22 @@ abstract class IrModuleDeserializer(
         val symbol = deserializeIrSymbol(proto.symbol) as IrFieldSymbol
         val type = deserializeIrType(proto.type)
         val field = symbolTable.declareField(UNDEFINED_OFFSET,
-            UNDEFINED_OFFSET,
-            irrelevantOrigin,
-            symbol.descriptor,
-            type,
-            { IrFieldImpl(
-                    start, end, origin,
-                    it,
-                    deserializeName(proto.name),
-                    type,
-                    deserializeVisibility(proto.visibility),
-                    proto.isFinal,
-                    proto.isExternal,
-                    proto.isStatic
-                )
-            }
+                                             UNDEFINED_OFFSET,
+                                             irrelevantOrigin,
+                                             symbol.descriptor,
+                                             type,
+                                             {
+                                                 IrFieldImpl(
+                                                     start, end, origin,
+                                                     it,
+                                                     deserializeName(proto.name),
+                                                     type,
+                                                     deserializeVisibility(proto.visibility),
+                                                     proto.isFinal,
+                                                     proto.isExternal,
+                                                     proto.isStatic
+                                                 )
+                                             }
         )
 
         val initializer = if (proto.hasInitializer()) deserializeExpression(proto.initializer) else null

compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleSerializer.kt

@@ -173,10 +173,10 @@ open class IrModuleSerializer(
         Variance.INVARIANT -> KotlinIr.IrTypeVariance.INV
     }
 
-    fun serializeAnnotations(annotations: List<IrCall>): KotlinIr.Annotations {
+    fun serializeAnnotations(annotations: List<IrConstructorCall>): KotlinIr.Annotations {
         val proto = KotlinIr.Annotations.newBuilder()
         annotations.forEach {
-            proto.addAnnotation(serializeCall(it))
+            proto.addAnnotation(serializeConstructorCall(it))
         }
         return proto.build()
     }
@@ -245,12 +245,12 @@ open class IrModuleSerializer(
     }
 
     // This is just IrType repacked as a data class, good to address a hash map.
-    data class IrTypeKey (
+    data class IrTypeKey(
         val kind: IrTypeKind,
         val classifier: IrClassifierSymbol?,
         val hasQuestionMark: Boolean?,
         val arguments: List<IrTypeArgumentKey>?,
-        val annotations: List<IrCall>
+        val annotations: List<IrConstructorCall>
     )
 
     data class IrTypeArgumentKey (
@@ -399,6 +399,13 @@ open class IrModuleSerializer(
         return proto.build()
     }
 
+    private fun serializeConstructorCall(call: IrConstructorCall): KotlinIr.IrConstructorCall =
+        KotlinIr.IrConstructorCall.newBuilder().apply {
+            symbol = serializeIrSymbol(call.symbol)
+            constructorTypeArgumentsCount = call.constructorTypeArgumentsCount
+            memberAccess = serializeMemberAccessCommon(call)
+        }.build()
+
     private fun serializeFunctionReference(callable: IrFunctionReference): KotlinIr.IrFunctionReference {
         val proto = KotlinIr.IrFunctionReference.newBuilder()
             .setSymbol(serializeIrSymbol(callable.symbol))

compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.txt

@@ -1,47 +1,47 @@
 FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
   CLASS CLASS name:A modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A 
-    CONSTRUCTOR visibility:public <> (runA:@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit>) returnType:<root>.A [primary] 
-      VALUE_PARAMETER name:runA index:0 type:@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> 
+    CONSTRUCTOR visibility:public <> (runA:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit>) returnType:<root>.A [primary] 
+      VALUE_PARAMETER name:runA index:0 type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> 
         EXPRESSION_BODY
-          BLOCK type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=LAMBDA
+          BLOCK type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:<root>.A, it:kotlin.String) returnType:kotlin.Unit 
               $receiver: VALUE_PARAMETER name:<this> type:<root>.A 
               VALUE_PARAMETER name:it index:0 type:kotlin.String 
               BLOCK_BODY
                 RETURN type=kotlin.Nothing from='local final fun <anonymous> (it: kotlin.String): kotlin.Unit declared in <root>.A.<init>'
                   GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
-            FUNCTION_REFERENCE 'local final fun <anonymous> (it: kotlin.String): kotlin.Unit declared in <root>.A.<init>' type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=LAMBDA
+            FUNCTION_REFERENCE 'local final fun <anonymous> (it: kotlin.String): kotlin.Unit declared in <root>.A.<init>' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=LAMBDA
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     PROPERTY name:runA visibility:public modality:FINAL [val] 
-      FIELD PROPERTY_BACKING_FIELD name:runA type:@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:public [final] 
+      FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'runA: @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A.<init>' type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-runA> visibility:public modality:FINAL <> ($this:<root>.A) returnType:@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> 
+          GET_VAR 'runA: @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A.<init>' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-runA> visibility:public modality:FINAL <> ($this:<root>.A) returnType:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> 
         correspondingProperty: PROPERTY name:runA visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.A 
         BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-runA> (): @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:runA type:@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:public [final] ' type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=null
+          RETURN type=kotlin.Nothing from='public final fun <get-runA> (): @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:public [final] ' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=null
               receiver: GET_VAR '<this>: <root>.A declared in <root>.A.<get-runA>' type=<root>.A origin=null
-    FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.A) returnType:@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> 
+    FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.A) returnType:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> 
       $this: VALUE_PARAMETER name:<this> type:<root>.A 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun component1 (): @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A'
-          CALL 'public final fun <get-runA> (): @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A' type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=GET_PROPERTY
+        RETURN type=kotlin.Nothing from='public final fun component1 (): @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A'
+          CALL 'public final fun <get-runA> (): @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=GET_PROPERTY
             $this: GET_VAR '<this>: <root>.A declared in <root>.A.component1' type=<root>.A origin=null
-    FUN GENERATED_DATA_CLASS_MEMBER name:copy visibility:public modality:FINAL <> ($this:<root>.A, runA:@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit>) returnType:<root>.A 
+    FUN GENERATED_DATA_CLASS_MEMBER name:copy visibility:public modality:FINAL <> ($this:<root>.A, runA:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit>) returnType:<root>.A 
       $this: VALUE_PARAMETER name:<this> type:<root>.A 
-      VALUE_PARAMETER name:runA index:0 type:@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> 
+      VALUE_PARAMETER name:runA index:0 type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> 
         EXPRESSION_BODY
-          CALL 'public final fun <get-runA> (): @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A' type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=GET_PROPERTY
+          CALL 'public final fun <get-runA> (): @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=GET_PROPERTY
             $this: GET_VAR '<this>: <root>.A declared in <root>.A.copy' type=<root>.A origin=null
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun copy (runA: @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit>): <root>.A declared in <root>.A'
-          CALL 'public constructor <init> (runA: @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit>) [primary] declared in <root>.A' type=<root>.A origin=null
-            runA: GET_VAR 'runA: @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A.copy' type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=null
+        RETURN type=kotlin.Nothing from='public final fun copy (runA: @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit>): <root>.A declared in <root>.A'
+          CALL 'public constructor <init> (runA: @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit>) [primary] declared in <root>.A' type=<root>.A origin=null
+            runA: GET_VAR 'runA: @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A.copy' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.A) returnType:kotlin.String 
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
@@ -51,7 +51,7 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
           STRING_CONCATENATION type=kotlin.String
             CONST String type=kotlin.String value="A("
             CONST String type=kotlin.String value="runA="
-            CALL 'public final fun <get-runA> (): @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A' type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=GET_PROPERTY
+            CALL 'public final fun <get-runA> (): @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=GET_PROPERTY
               $this: GET_VAR '<this>: <root>.A declared in <root>.A.toString' type=<root>.A origin=null
             CONST String type=kotlin.String value=")"
     FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.A) returnType:kotlin.Int 
@@ -63,7 +63,7 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
           CONST Int type=kotlin.Int value=0
         SET_VAR 'var tmp0_result: kotlin.Int [var] declared in <root>.A.hashCode' type=kotlin.Unit origin=EQ
           CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Function2' type=kotlin.Int origin=null
-            $this: CALL 'public final fun <get-runA> (): @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A' type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=GET_PROPERTY
+            $this: CALL 'public final fun <get-runA> (): @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=GET_PROPERTY
               $this: GET_VAR '<this>: <root>.A declared in <root>.A.hashCode' type=<root>.A origin=null
         RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.A'
           GET_VAR 'var tmp0_result: kotlin.Int [var] declared in <root>.A.hashCode' type=kotlin.Int origin=null
@@ -93,9 +93,9 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
           BRANCH
             if: CALL 'public final fun not (): kotlin.Boolean declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ
               $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ
-                arg0: CALL 'public final fun <get-runA> (): @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A' type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=GET_PROPERTY
+                arg0: CALL 'public final fun <get-runA> (): @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=GET_PROPERTY
                   $this: GET_VAR '<this>: <root>.A declared in <root>.A.equals' type=<root>.A origin=null
-                arg1: CALL 'public final fun <get-runA> (): @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A' type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=GET_PROPERTY
+                arg1: CALL 'public final fun <get-runA> (): @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=GET_PROPERTY
                   $this: GET_VAR 'val tmp0_other_with_cast: <root>.A [val] declared in <root>.A.equals' type=<root>.A origin=null
             then: RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.A'
               CONST Boolean type=kotlin.Boolean value=false

compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.txt

@@ -85,22 +85,6 @@ FILE fqName:<root> fileName:/annotationsInAnnotationArguments.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public constructor <init> (a: <root>.A1) [primary] declared in <root>.A2' type=<root>.A2 origin=null
-        a: CALL 'public constructor <init> (x: kotlin.Int) [primary] declared in <root>.A1' type=<root>.A1 origin=null
-          x: CONST Int type=kotlin.Int value=42
-      CALL 'public constructor <init> (xs: kotlin.Array<<root>.A1>) [primary] declared in <root>.AA' type=<root>.AA origin=null
-        xs: VARARG type=kotlin.Array<<root>.A1> varargElementType=<root>.A1
-          CALL 'public constructor <init> (x: kotlin.Int) [primary] declared in <root>.A1' type=<root>.A1 origin=null
-            x: CONST Int type=kotlin.Int value=1
-          CALL 'public constructor <init> (x: kotlin.Int) [primary] declared in <root>.A1' type=<root>.A1 origin=null
-            x: CONST Int type=kotlin.Int value=2
-      CALL 'public constructor <init> (a: <root>.A1) [primary] declared in <root>.A2' type=<root>.A2 origin=null
-        a: CALL 'public constructor <init> (x: kotlin.Int) [primary] declared in <root>.A1' type=<root>.A1 origin=null
-          x: CONST Int type=kotlin.Int value=42
-      CALL 'public constructor <init> (xs: kotlin.Array<<root>.A1>) [primary] declared in <root>.AA' type=<root>.AA origin=null
-        xs: VARARG type=kotlin.Array<<root>.A1> varargElementType=<root>.A1
-          CALL 'public constructor <init> (x: kotlin.Int) [primary] declared in <root>.A1' type=<root>.A1 origin=null
-            x: CONST Int type=kotlin.Int value=1
-          CALL 'public constructor <init> (x: kotlin.Int) [primary] declared in <root>.A1' type=<root>.A1 origin=null
-            x: CONST Int type=kotlin.Int value=2
+      A2(a = A1(x = '42'))
+      AA(xs = [A1(x = '1'), A1(x = '2')])
     BLOCK_BODY

compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.txt

@@ -45,26 +45,21 @@ FILE fqName:<root> fileName:/annotationsWithDefaultParameterValues.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public constructor <init> (x: kotlin.String, y: kotlin.Int) [primary] declared in <root>.A' type=<root>.A origin=null
-        x: CONST String type=kotlin.String value="abc"
-        y: CONST Int type=kotlin.Int value=123
+      A(x = 'abc', y = '123')
     BLOCK_BODY
   FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public constructor <init> (x: kotlin.String, y: kotlin.Int) [primary] declared in <root>.A' type=<root>.A origin=null
-        x: CONST String type=kotlin.String value="def"
+      A(x = 'def', y = <null>)
     BLOCK_BODY
   FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public constructor <init> (x: kotlin.String, y: kotlin.Int) [primary] declared in <root>.A' type=<root>.A origin=null
-        x: CONST String type=kotlin.String value="ghi"
+      A(x = 'ghi', y = <null>)
     BLOCK_BODY
   FUN name:test4 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public constructor <init> (x: kotlin.String, y: kotlin.Int) [primary] declared in <root>.A' type=<root>.A origin=null
-        y: CONST Int type=kotlin.Int value=456
+      A(x = <null>, y = '456')
     BLOCK_BODY
   FUN name:test5 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public constructor <init> (x: kotlin.String, y: kotlin.Int) [primary] declared in <root>.A' type=<root>.A origin=null
+      A(x = <null>, y = <null>)
     BLOCK_BODY

compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.txt

@@ -29,19 +29,13 @@ FILE fqName:<root> fileName:/annotationsWithVarargParameters.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public constructor <init> (vararg xs: kotlin.String) [primary] declared in <root>.A' type=<root>.A origin=null
-        xs: VARARG type=kotlin.Array<out kotlin.String> varargElementType=kotlin.String
-          CONST String type=kotlin.String value="abc"
-          CONST String type=kotlin.String value="def"
+      A(xs = ['abc', 'def'])
     BLOCK_BODY
   FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public constructor <init> (vararg xs: kotlin.String) [primary] declared in <root>.A' type=<root>.A origin=null
-        xs: VARARG type=kotlin.Array<out kotlin.String> varargElementType=kotlin.String
-          CONST String type=kotlin.String value="abc"
+      A(xs = ['abc'])
     BLOCK_BODY
   FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public constructor <init> (vararg xs: kotlin.String) [primary] declared in <root>.A' type=<root>.A origin=null
-        xs: VARARG type=kotlin.Array<out kotlin.String> varargElementType=kotlin.String
+      A(xs = [])
     BLOCK_BODY

compiler/testData/ir/irText/declarations/annotations/arrayInAnnotationArguments.txt

@@ -57,47 +57,11 @@ FILE fqName:<root> fileName:/arrayInAnnotationArguments.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public constructor <init> (x: kotlin.IntArray) [primary] declared in <root>.TestAnnWithIntArray' type=<root>.TestAnnWithIntArray origin=null
-        x: VARARG type=kotlin.IntArray varargElementType=kotlin.Int
-          CONST Int type=kotlin.Int value=1
-          CONST Int type=kotlin.Int value=2
-          CONST Int type=kotlin.Int value=3
-      CALL 'public constructor <init> (x: kotlin.Array<kotlin.String>) [primary] declared in <root>.TestAnnWithStringArray' type=<root>.TestAnnWithStringArray origin=null
-        x: VARARG type=kotlin.Array<kotlin.String> varargElementType=kotlin.String
-          CONST String type=kotlin.String value="a"
-          CONST String type=kotlin.String value="b"
-          CONST String type=kotlin.String value="c"
-      CALL 'public constructor <init> (x: kotlin.IntArray) [primary] declared in <root>.TestAnnWithIntArray' type=<root>.TestAnnWithIntArray origin=null
-        x: VARARG type=kotlin.IntArray varargElementType=kotlin.Int
-          CONST Int type=kotlin.Int value=1
-          CONST Int type=kotlin.Int value=2
-          CONST Int type=kotlin.Int value=3
-      CALL 'public constructor <init> (x: kotlin.Array<kotlin.String>) [primary] declared in <root>.TestAnnWithStringArray' type=<root>.TestAnnWithStringArray origin=null
-        x: VARARG type=kotlin.Array<kotlin.String> varargElementType=kotlin.String
-          CONST String type=kotlin.String value="a"
-          CONST String type=kotlin.String value="b"
-          CONST String type=kotlin.String value="c"
+      TestAnnWithIntArray(x = ['1', '2', '3'])
+      TestAnnWithStringArray(x = ['a', 'b', 'c'])
     BLOCK_BODY
   FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public constructor <init> (x: kotlin.IntArray) [primary] declared in <root>.TestAnnWithIntArray' type=<root>.TestAnnWithIntArray origin=null
-        x: VARARG type=kotlin.IntArray varargElementType=kotlin.Int
-          CONST Int type=kotlin.Int value=4
-          CONST Int type=kotlin.Int value=5
-          CONST Int type=kotlin.Int value=6
-      CALL 'public constructor <init> (x: kotlin.Array<kotlin.String>) [primary] declared in <root>.TestAnnWithStringArray' type=<root>.TestAnnWithStringArray origin=null
-        x: VARARG type=kotlin.Array<kotlin.String> varargElementType=kotlin.String
-          CONST String type=kotlin.String value="d"
-          CONST String type=kotlin.String value="e"
-          CONST String type=kotlin.String value="f"
-      CALL 'public constructor <init> (x: kotlin.IntArray) [primary] declared in <root>.TestAnnWithIntArray' type=<root>.TestAnnWithIntArray origin=null
-        x: VARARG type=kotlin.IntArray varargElementType=kotlin.Int
-          CONST Int type=kotlin.Int value=4
-          CONST Int type=kotlin.Int value=5
-          CONST Int type=kotlin.Int value=6
-      CALL 'public constructor <init> (x: kotlin.Array<kotlin.String>) [primary] declared in <root>.TestAnnWithStringArray' type=<root>.TestAnnWithStringArray origin=null
-        x: VARARG type=kotlin.Array<kotlin.String> varargElementType=kotlin.String
-          CONST String type=kotlin.String value="d"
-          CONST String type=kotlin.String value="e"
-          CONST String type=kotlin.String value="f"
+      TestAnnWithIntArray(x = ['4', '5', '6'])
+      TestAnnWithStringArray(x = ['d', 'e', 'f'])
     BLOCK_BODY

compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.txt

@@ -48,8 +48,7 @@ FILE fqName:<root> fileName:/classLiteralInAnnotation.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public constructor <init> (klass: kotlin.reflect.KClass<*>) [primary] declared in <root>.A' type=<root>.A origin=null
-        klass: CLASS_REFERENCE 'CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<<root>.C>
+      A(klass = CLASS_REFERENCE 'CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<<root>.C>)
     BLOCK_BODY
   FUN name:test2 visibility:public modality:FINAL <T> () returnType:kotlin.Any [inline] 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
@@ -58,8 +57,7 @@ FILE fqName:<root> fileName:/classLiteralInAnnotation.kt
         BLOCK type=<root>.test2.<no name provided><T of <root>.test2> origin=OBJECT_LITERAL
           CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[kotlin.Any]
             annotations:
-              CALL 'public constructor <init> (klass: kotlin.reflect.KClass<*>) [primary] declared in <root>.A' type=<root>.A origin=null
-                klass: CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public superTypes:[]' type=kotlin.reflect.KClass<kotlin.Any>
+              A(klass = CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public superTypes:[]' type=kotlin.reflect.KClass<kotlin.Any>)
             $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.test2.<no name provided><T of <root>.test2> 
             CONSTRUCTOR visibility:public <> () returnType:<root>.test2.<no name provided><T of <root>.test2> [primary] 
               BLOCK_BODY
@@ -89,8 +87,7 @@ FILE fqName:<root> fileName:/classLiteralInAnnotation.kt
           BLOCK type=<root>.<get-test3>.<no name provided> origin=OBJECT_LITERAL
             CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[kotlin.Any]
               annotations:
-                CALL 'public constructor <init> (klass: kotlin.reflect.KClass<*>) [primary] declared in <root>.A' type=<root>.A origin=null
-                  klass: CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public superTypes:[]' type=kotlin.reflect.KClass<kotlin.Any>
+                A(klass = CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public superTypes:[]' type=kotlin.reflect.KClass<kotlin.Any>)
               $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.<get-test3>.<no name provided> 
               CONSTRUCTOR visibility:public <> () returnType:<root>.<get-test3>.<no name provided> [primary] 
                 BLOCK_BODY
@@ -120,8 +117,7 @@ FILE fqName:<root> fileName:/classLiteralInAnnotation.kt
           BLOCK type=<root>.<set-test3>.<no name provided> origin=OBJECT_LITERAL
             CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[kotlin.Any]
               annotations:
-                CALL 'public constructor <init> (klass: kotlin.reflect.KClass<*>) [primary] declared in <root>.A' type=<root>.A origin=null
-                  klass: CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public superTypes:[]' type=kotlin.reflect.KClass<kotlin.Any>
+                A(klass = CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public superTypes:[]' type=kotlin.reflect.KClass<kotlin.Any>)
               $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.<set-test3>.<no name provided> 
               CONSTRUCTOR visibility:public <> () returnType:<root>.<set-test3>.<no name provided> [primary] 
                 BLOCK_BODY

compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.txt

@@ -29,8 +29,7 @@ FILE fqName:<root> fileName:/classesWithAnnotations.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   CLASS CLASS name:TestClass modality:FINAL visibility:public superTypes:[kotlin.Any]
     annotations:
-      CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-        x: CONST String type=kotlin.String value="class"
+      TestAnn(x = 'class')
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestClass 
     CONSTRUCTOR visibility:public <> () returnType:<root>.TestClass [primary] 
       BLOCK_BODY
@@ -51,8 +50,7 @@ FILE fqName:<root> fileName:/classesWithAnnotations.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   CLASS INTERFACE name:TestInterface modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
     annotations:
-      CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-        x: CONST String type=kotlin.String value="interface"
+      TestAnn(x = 'interface')
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestInterface 
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
@@ -69,8 +67,7 @@ FILE fqName:<root> fileName:/classesWithAnnotations.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   CLASS OBJECT name:TestObject modality:FINAL visibility:public superTypes:[kotlin.Any]
     annotations:
-      CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-        x: CONST String type=kotlin.String value="object"
+      TestAnn(x = 'object')
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestObject 
     CONSTRUCTOR visibility:private <> () returnType:<root>.TestObject [primary] 
       BLOCK_BODY
@@ -97,8 +94,7 @@ FILE fqName:<root> fileName:/classesWithAnnotations.kt
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Host modality:FINAL visibility:public superTypes:[kotlin.Any]'
     CLASS OBJECT name:TestCompanion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]
       annotations:
-        CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-          x: CONST String type=kotlin.String value="companion"
+        TestAnn(x = 'companion')
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Host.TestCompanion 
       CONSTRUCTOR visibility:private <> () returnType:<root>.Host.TestCompanion [primary] 
         BLOCK_BODY
@@ -132,8 +128,7 @@ FILE fqName:<root> fileName:/classesWithAnnotations.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   CLASS ENUM_CLASS name:TestEnum modality:FINAL visibility:public superTypes:[kotlin.Enum<<root>.TestEnum>]
     annotations:
-      CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-        x: CONST String type=kotlin.String value="enum"
+      TestAnn(x = 'enum')
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestEnum 
     CONSTRUCTOR visibility:private <> () returnType:<root>.TestEnum [primary] 
       BLOCK_BODY
@@ -189,8 +184,7 @@ FILE fqName:<root> fileName:/classesWithAnnotations.kt
       SYNTHETIC_BODY kind=ENUM_VALUEOF
   CLASS ANNOTATION_CLASS name:TestAnnotation modality:FINAL visibility:public superTypes:[kotlin.Annotation]
     annotations:
-      CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-        x: CONST String type=kotlin.String value="annotation"
+      TestAnn(x = 'annotation')
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestAnnotation 
     CONSTRUCTOR visibility:public <> () returnType:<root>.TestAnnotation [primary] 
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 

compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.txt

@@ -38,11 +38,9 @@ FILE fqName:<root> fileName:/constExpressionsInAnnotationArguments.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public constructor <init> (x: kotlin.Int) [primary] declared in <root>.A' type=<root>.A origin=null
-        x: CONST Int type=kotlin.Int value=1
+      A(x = '1')
     BLOCK_BODY
   FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public constructor <init> (x: kotlin.Int) [primary] declared in <root>.A' type=<root>.A origin=null
-        x: CONST Int type=kotlin.Int value=2
+      A(x = '2')
     BLOCK_BODY

compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.txt

@@ -31,15 +31,13 @@ FILE fqName:<root> fileName:/constructorsWithAnnotations.kt
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestClass 
     CONSTRUCTOR visibility:public <> () returnType:<root>.TestClass [primary] 
       annotations:
-        CALL 'public constructor <init> (x: kotlin.Int) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-          x: CONST Int type=kotlin.Int value=1
+        TestAnn(x = '1')
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestClass modality:FINAL visibility:public superTypes:[kotlin.Any]'
     CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:<root>.TestClass 
       annotations:
-        CALL 'public constructor <init> (x: kotlin.Int) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-          x: CONST Int type=kotlin.Int value=2
+        TestAnn(x = '2')
       VALUE_PARAMETER name:x index:0 type:kotlin.Int 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.TestClass'

compiler/testData/ir/irText/declarations/annotations/delegateFieldWithAnnotations.txt

@@ -18,7 +18,7 @@ FILE fqName:<root> fileName:/delegateFieldWithAnnotations.kt
   PROPERTY name:test1 visibility:public modality:FINAL [delegated,val] 
     FIELD DELEGATE name:test1$delegate type:kotlin.Lazy<kotlin.Int> visibility:private [final,static] 
       annotations:
-        CALL 'public constructor <init> () [primary] declared in <root>.Ann' type=<root>.Ann origin=null
+        Ann
       EXPRESSION_BODY
         CALL 'public final fun lazy <T> (initializer: kotlin.Function0<T of kotlin.lazy>): kotlin.Lazy<T of kotlin.lazy> declared in kotlin' type=kotlin.Lazy<kotlin.Int> origin=null
           <T>: kotlin.Int

compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.txt

@@ -90,8 +90,7 @@ FILE fqName:<root> fileName:/delegatedPropertyAccessorsWithAnnotations.kt
           value: CONST Int type=kotlin.Int value=1
     FUN DELEGATED_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:kotlin.Int 
       annotations:
-        CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.A' type=<root>.A origin=null
-          x: CONST String type=kotlin.String value="test1.get"
+        A(x = 'test1.get')
       correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [delegated,val] 
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test1> (): kotlin.Int declared in <root>'
@@ -106,8 +105,7 @@ FILE fqName:<root> fileName:/delegatedPropertyAccessorsWithAnnotations.kt
           value: CONST Int type=kotlin.Int value=2
     FUN DELEGATED_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:kotlin.Int 
       annotations:
-        CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.A' type=<root>.A origin=null
-          x: CONST String type=kotlin.String value="test2.get"
+        A(x = 'test2.get')
       correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [delegated,var] 
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test2> (): kotlin.Int declared in <root>'
@@ -117,13 +115,11 @@ FILE fqName:<root> fileName:/delegatedPropertyAccessorsWithAnnotations.kt
             kProp: PROPERTY_REFERENCE 'public final test2: kotlin.Int [delegated,var]' field=null getter='public final fun <get-test2> (): kotlin.Int declared in <root>' setter='public final fun <set-test2> (<set-?>: kotlin.Int): kotlin.Unit declared in <root>' type=kotlin.reflect.KMutableProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
     FUN DELEGATED_PROPERTY_ACCESSOR name:<set-test2> visibility:public modality:FINAL <> (<set-?>:kotlin.Int) returnType:kotlin.Unit 
       annotations:
-        CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.A' type=<root>.A origin=null
-          x: CONST String type=kotlin.String value="test2.set"
+        A(x = 'test2.set')
       correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [delegated,var] 
       VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int 
         annotations:
-          CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.A' type=<root>.A origin=null
-            x: CONST String type=kotlin.String value="test2.set.param"
+          A(x = 'test2.set.param')
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <set-test2> (<set-?>: kotlin.Int): kotlin.Unit declared in <root>'
           CALL 'public final fun setValue (thisRef: kotlin.Any?, kProp: kotlin.Any?, newValue: kotlin.Int): kotlin.Unit declared in <root>.Cell' type=kotlin.Unit origin=null

compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.txt

@@ -36,18 +36,15 @@ FILE fqName:<root> fileName:/enumEntriesWithAnnotations.kt
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:TestEnum modality:OPEN visibility:public superTypes:[kotlin.Enum<<root>.TestEnum>]'
     ENUM_ENTRY name:ENTRY1
       annotations:
-        CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-          x: CONST String type=kotlin.String value="ENTRY1"
+        TestAnn(x = 'ENTRY1')
       init: ENUM_CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.TestEnum'
     ENUM_ENTRY name:ENTRY2
       annotations:
-        CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-          x: CONST String type=kotlin.String value="ENTRY2"
+        TestAnn(x = 'ENTRY2')
       init: ENUM_CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.TestEnum.ENTRY2'
       class: CLASS ENUM_ENTRY name:ENTRY2 modality:FINAL visibility:public superTypes:[<root>.TestEnum]
         annotations:
-          CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-            x: CONST String type=kotlin.String value="ENTRY2"
+          TestAnn(x = 'ENTRY2')
         $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestEnum.ENTRY2 
         CONSTRUCTOR visibility:private <> () returnType:<root>.TestEnum.ENTRY2 [primary] 
           BLOCK_BODY

compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.txt

@@ -91,6 +91,5 @@ FILE fqName:<root> fileName:/enumsInAnnotationArguments.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public constructor <init> (x: <root>.En) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-        x: GET_ENUM 'ENUM_ENTRY name:A' type=<root>.En
+      TestAnn(x = GET_ENUM 'ENUM_ENTRY name:A' type=<root>.En)
     BLOCK_BODY

compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.txt

@@ -30,8 +30,7 @@ FILE fqName:<root> fileName:/fieldsWithAnnotations.kt
   PROPERTY name:testVal visibility:public modality:FINAL [val] 
     FIELD PROPERTY_BACKING_FIELD name:testVal type:kotlin.String visibility:public [final,static] 
       annotations:
-        CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-          x: CONST String type=kotlin.String value="testVal.field"
+        TestAnn(x = 'testVal.field')
       EXPRESSION_BODY
         CONST String type=kotlin.String value="a val"
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testVal> visibility:public modality:FINAL <> () returnType:kotlin.String 
@@ -42,8 +41,7 @@ FILE fqName:<root> fileName:/fieldsWithAnnotations.kt
   PROPERTY name:testVar visibility:public modality:FINAL [var] 
     FIELD PROPERTY_BACKING_FIELD name:testVar type:kotlin.String visibility:public [static] 
       annotations:
-        CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-          x: CONST String type=kotlin.String value="testVar.field"
+        TestAnn(x = 'testVar.field')
       EXPRESSION_BODY
         CONST String type=kotlin.String value="a var"
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testVar> visibility:public modality:FINAL <> () returnType:kotlin.String 

compiler/testData/ir/irText/declarations/annotations/fileAnnotations.txt

@@ -1,12 +1,9 @@
 FILE fqName:test fileName:/fileAnnotations.kt
   annotations:
-    CALL 'public constructor <init> (x: kotlin.String) [primary] declared in test.A' type=test.A origin=null
-      x: CONST String type=kotlin.String value="File annotation"
+    A(x = 'File annotation')
   CLASS ANNOTATION_CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Annotation]
     annotations:
-      CALL 'public constructor <init> (vararg allowedTargets: kotlin.annotation.AnnotationTarget) [primary] declared in kotlin.annotation.Target' type=kotlin.annotation.Target origin=null
-        allowedTargets: VARARG type=kotlin.Array<out kotlin.annotation.AnnotationTarget> varargElementType=kotlin.annotation.AnnotationTarget
-          GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:FILE' type=kotlin.annotation.AnnotationTarget
+      Target(allowedTargets = [GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:FILE' type=kotlin.annotation.AnnotationTarget])
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:test.A 
     CONSTRUCTOR visibility:public <> (x:kotlin.String) returnType:test.A [primary] 
       VALUE_PARAMETER name:x index:0 type:kotlin.String 

compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.txt

@@ -29,6 +29,5 @@ FILE fqName:<root> fileName:/functionsWithAnnotations.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:testSimpleFunction visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public constructor <init> (x: kotlin.Int) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-        x: CONST Int type=kotlin.Int value=42
+      TestAnn(x = '42')
     BLOCK_BODY

compiler/testData/ir/irText/declarations/annotations/javaAnnotation.txt

@@ -1,17 +1,13 @@
 FILE fqName:<root> fileName:/javaAnnotation.kt
   FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public/*package*/ constructor <init> (value: kotlin.String, i: kotlin.Int) [primary] declared in <root>.JavaAnn' type=<root>.JavaAnn origin=null
+      JavaAnn(value = <null>, i = <null>)
     BLOCK_BODY
   FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public/*package*/ constructor <init> (value: kotlin.String, i: kotlin.Int) [primary] declared in <root>.JavaAnn' type=<root>.JavaAnn origin=null
-        value: CONST String type=kotlin.String value="abc"
-        i: CONST Int type=kotlin.Int value=123
+      JavaAnn(value = 'abc', i = '123')
     BLOCK_BODY
   FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public/*package*/ constructor <init> (value: kotlin.String, i: kotlin.Int) [primary] declared in <root>.JavaAnn' type=<root>.JavaAnn origin=null
-        value: CONST String type=kotlin.String value="abc"
-        i: CONST Int type=kotlin.Int value=123
+      JavaAnn(value = 'abc', i = '123')
     BLOCK_BODY

compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.txt

@@ -32,8 +32,7 @@ FILE fqName:<root> fileName:/localDelegatedPropertiesWithAnnotations.kt
     BLOCK_BODY
       LOCAL_DELEGATED_PROPERTY name:test type:kotlin.Int flags:val
         annotations:
-          CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.A' type=<root>.A origin=null
-            x: CONST String type=kotlin.String value="foo/test"
+          A(x = 'foo/test')
         VAR DELEGATE name:test$delegate type:kotlin.Lazy<kotlin.Int> [val] 
           CALL 'public final fun lazy <T> (initializer: kotlin.Function0<T of kotlin.lazy>): kotlin.Lazy<T of kotlin.lazy> declared in kotlin' type=kotlin.Lazy<kotlin.Int> origin=null
             <T>: kotlin.Int

compiler/testData/ir/irText/declarations/annotations/multipleAnnotationsInSquareBrackets.txt

@@ -49,13 +49,7 @@ FILE fqName:<root> fileName:/multipleAnnotationsInSquareBrackets.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public constructor <init> () [primary] declared in <root>.A1' type=<root>.A1 origin=null
-      CALL 'public constructor <init> () [primary] declared in <root>.A2' type=<root>.A2 origin=null
-      CALL 'public constructor <init> () [primary] declared in <root>.A3' type=<root>.A3 origin=null
-      CALL 'public constructor <init> () [primary] declared in <root>.A1' type=<root>.A1 origin=null
-      CALL 'public constructor <init> () [primary] declared in <root>.A2' type=<root>.A2 origin=null
-      CALL 'public constructor <init> () [primary] declared in <root>.A3' type=<root>.A3 origin=null
-      CALL 'public constructor <init> () [primary] declared in <root>.A1' type=<root>.A1 origin=null
-      CALL 'public constructor <init> () [primary] declared in <root>.A2' type=<root>.A2 origin=null
-      CALL 'public constructor <init> () [primary] declared in <root>.A3' type=<root>.A3 origin=null
+      A1
+      A2
+      A3
     BLOCK_BODY

compiler/testData/ir/irText/declarations/annotations/primaryConstructorParameterWithAnnotations.txt

@@ -20,7 +20,7 @@ FILE fqName:<root> fileName:/primaryConstructorParameterWithAnnotations.kt
     CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:<root>.Test [primary] 
       VALUE_PARAMETER name:x index:0 type:kotlin.Int 
         annotations:
-          CALL 'public constructor <init> () [primary] declared in <root>.Ann' type=<root>.Ann origin=null
+          Ann
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test modality:FINAL visibility:public superTypes:[kotlin.Any]'

compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.txt

@@ -29,8 +29,7 @@ FILE fqName:<root> fileName:/propertiesWithAnnotations.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   PROPERTY name:testVal visibility:public modality:FINAL [val] 
     annotations:
-      CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-        x: CONST String type=kotlin.String value="testVal.property"
+      TestAnn(x = 'testVal.property')
     FIELD PROPERTY_BACKING_FIELD name:testVal type:kotlin.String visibility:public [final,static] 
       EXPRESSION_BODY
         CONST String type=kotlin.String value=""

compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.txt

@@ -41,8 +41,7 @@ FILE fqName:<root> fileName:/propertyAccessorsFromClassHeaderWithAnnotations.kt
           GET_VAR 'x: kotlin.Int declared in <root>.C.<init>' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.C) returnType:kotlin.Int 
         annotations:
-          CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.A' type=<root>.A origin=null
-            x: CONST String type=kotlin.String value="C.x.get"
+          A(x = 'C.x.get')
         correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.C 
         BLOCK_BODY
@@ -55,8 +54,7 @@ FILE fqName:<root> fileName:/propertyAccessorsFromClassHeaderWithAnnotations.kt
           GET_VAR 'y: kotlin.Int declared in <root>.C.<init>' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:<root>.C) returnType:kotlin.Int 
         annotations:
-          CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.A' type=<root>.A origin=null
-            x: CONST String type=kotlin.String value="C.y.get"
+          A(x = 'C.y.get')
         correspondingProperty: PROPERTY name:y visibility:public modality:FINAL [var] 
         $this: VALUE_PARAMETER name:<this> type:<root>.C 
         BLOCK_BODY
@@ -65,8 +63,7 @@ FILE fqName:<root> fileName:/propertyAccessorsFromClassHeaderWithAnnotations.kt
               receiver: GET_VAR '<this>: <root>.C declared in <root>.C.<get-y>' type=<root>.C origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-y> visibility:public modality:FINAL <> ($this:<root>.C, <set-?>:kotlin.Int) returnType:kotlin.Unit 
         annotations:
-          CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.A' type=<root>.A origin=null
-            x: CONST String type=kotlin.String value="C.y.set"
+          A(x = 'C.y.set')
         correspondingProperty: PROPERTY name:y visibility:public modality:FINAL [var] 
         $this: VALUE_PARAMETER name:<this> type:<root>.C 
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int 

compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.txt

@@ -30,8 +30,7 @@ FILE fqName:<root> fileName:/propertyAccessorsWithAnnotations.kt
   PROPERTY name:test1 visibility:public modality:FINAL [val] 
     FUN name:<get-test1> visibility:public modality:FINAL <> () returnType:kotlin.String 
       annotations:
-        CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-          x: CONST String type=kotlin.String value="test1.get"
+        TestAnn(x = 'test1.get')
       correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] 
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test1> (): kotlin.String declared in <root>'
@@ -39,16 +38,14 @@ FILE fqName:<root> fileName:/propertyAccessorsWithAnnotations.kt
   PROPERTY name:test2 visibility:public modality:FINAL [var] 
     FUN name:<get-test2> visibility:public modality:FINAL <> () returnType:kotlin.String 
       annotations:
-        CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-          x: CONST String type=kotlin.String value="test2.get"
+        TestAnn(x = 'test2.get')
       correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [var] 
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test2> (): kotlin.String declared in <root>'
           CONST String type=kotlin.String value=""
     FUN name:<set-test2> visibility:public modality:FINAL <> (value:kotlin.String) returnType:kotlin.Unit 
       annotations:
-        CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-          x: CONST String type=kotlin.String value="test2.set"
+        TestAnn(x = 'test2.set')
       correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [var] 
       VALUE_PARAMETER name:value index:0 type:kotlin.String 
       BLOCK_BODY
@@ -58,8 +55,7 @@ FILE fqName:<root> fileName:/propertyAccessorsWithAnnotations.kt
         CONST String type=kotlin.String value=""
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> () returnType:kotlin.String 
       annotations:
-        CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-          x: CONST String type=kotlin.String value="test3.get"
+        TestAnn(x = 'test3.get')
       correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val] 
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test3> (): kotlin.String declared in <root>'
@@ -70,16 +66,14 @@ FILE fqName:<root> fileName:/propertyAccessorsWithAnnotations.kt
         CONST String type=kotlin.String value=""
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test4> visibility:public modality:FINAL <> () returnType:kotlin.String 
       annotations:
-        CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-          x: CONST String type=kotlin.String value="test4.get"
+        TestAnn(x = 'test4.get')
       correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [var] 
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test4> (): kotlin.String declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.String visibility:public [static] ' type=kotlin.String origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<set-test4> visibility:public modality:FINAL <> (<set-?>:kotlin.String) returnType:kotlin.Unit 
       annotations:
-        CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-          x: CONST String type=kotlin.String value="test4.set"
+        TestAnn(x = 'test4.set')
       correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [var] 
       VALUE_PARAMETER name:<set-?> index:0 type:kotlin.String 
       BLOCK_BODY

compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.txt

@@ -28,7 +28,7 @@ FILE fqName:<root> fileName:/propertySetterParameterWithAnnotations.kt
       correspondingProperty: PROPERTY name:p visibility:public modality:FINAL [var] 
       VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int 
         annotations:
-          CALL 'public constructor <init> () [primary] declared in <root>.AnnParam' type=<root>.AnnParam origin=null
+          AnnParam
       BLOCK_BODY
         SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static] ' type=kotlin.Unit origin=null
           value: GET_VAR '<set-?>: kotlin.Int declared in <root>.<set-p>' type=kotlin.Int origin=null
@@ -55,7 +55,7 @@ FILE fqName:<root> fileName:/propertySetterParameterWithAnnotations.kt
         $this: VALUE_PARAMETER name:<this> type:<root>.C 
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int 
           annotations:
-            CALL 'public constructor <init> () [primary] declared in <root>.AnnParam' type=<root>.AnnParam origin=null
+            AnnParam
         BLOCK_BODY
           SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public ' type=kotlin.Unit origin=null
             receiver: GET_VAR '<this>: <root>.C declared in <root>.C.<set-p>' type=<root>.C origin=null

compiler/testData/ir/irText/declarations/annotations/receiverParameterWithAnnotations.txt

@@ -25,7 +25,7 @@ FILE fqName:<root> fileName:/receiverParameterWithAnnotations.kt
       $this: VALUE_PARAMETER name:<this> type:<root>.A 
       $receiver: VALUE_PARAMETER name:<this> type:kotlin.String 
         annotations:
-          CALL 'public constructor <init> () [primary] declared in <root>.Ann' type=<root>.Ann origin=null
+          Ann
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun f (): kotlin.String declared in <root>.A'
           CONST String type=kotlin.String value=""
@@ -35,7 +35,7 @@ FILE fqName:<root> fileName:/receiverParameterWithAnnotations.kt
         $this: VALUE_PARAMETER name:<this> type:<root>.A 
         $receiver: VALUE_PARAMETER name:<this> type:kotlin.String? 
           annotations:
-            CALL 'public constructor <init> () [primary] declared in <root>.Ann' type=<root>.Ann origin=null
+            Ann
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='public final fun <get-p> (): kotlin.String declared in <root>.A'
             CONST String type=kotlin.String value=""
@@ -55,7 +55,7 @@ FILE fqName:<root> fileName:/receiverParameterWithAnnotations.kt
   FUN name:topLevelF visibility:public modality:FINAL <> ($receiver:kotlin.String?) returnType:kotlin.String 
     $receiver: VALUE_PARAMETER name:<this> type:kotlin.String? 
       annotations:
-        CALL 'public constructor <init> () [primary] declared in <root>.Ann' type=<root>.Ann origin=null
+        Ann
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun topLevelF (): kotlin.String declared in <root>'
         CONST String type=kotlin.String value=""
@@ -64,7 +64,7 @@ FILE fqName:<root> fileName:/receiverParameterWithAnnotations.kt
       correspondingProperty: PROPERTY name:topLevelP visibility:public modality:FINAL [val] 
       $receiver: VALUE_PARAMETER name:<this> type:kotlin.String 
         annotations:
-          CALL 'public constructor <init> () [primary] declared in <root>.Ann' type=<root>.Ann origin=null
+          Ann
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-topLevelP> (): kotlin.String declared in <root>'
           CONST String type=kotlin.String value=""

compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.txt

@@ -29,10 +29,5 @@ FILE fqName:<root> fileName:/spreadOperatorInAnnotationArguments.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public constructor <init> (vararg xs: kotlin.String) [primary] declared in <root>.A' type=<root>.A origin=null
-        xs: VARARG type=kotlin.Array<out kotlin.String> varargElementType=kotlin.String
-          VARARG type=kotlin.Array<kotlin.String> varargElementType=kotlin.String
-            CONST String type=kotlin.String value="a"
-          VARARG type=kotlin.Array<kotlin.String> varargElementType=kotlin.String
-            CONST String type=kotlin.String value="b"
+      A(xs = [['a'], ['b']])
     BLOCK_BODY

compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.txt

@@ -1,9 +1,7 @@
 FILE fqName:<root> fileName:/typeAliasesWithAnnotations.kt
   CLASS ANNOTATION_CLASS name:TestAnn modality:FINAL visibility:public superTypes:[kotlin.Annotation]
     annotations:
-      CALL 'public constructor <init> (vararg allowedTargets: kotlin.annotation.AnnotationTarget) [primary] declared in kotlin.annotation.Target' type=kotlin.annotation.Target origin=null
-        allowedTargets: VARARG type=kotlin.Array<out kotlin.annotation.AnnotationTarget> varargElementType=kotlin.annotation.AnnotationTarget
-          GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:TYPEALIAS' type=kotlin.annotation.AnnotationTarget
+      Target(allowedTargets = [GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:TYPEALIAS' type=kotlin.annotation.AnnotationTarget])
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestAnn 
     CONSTRUCTOR visibility:public <> (x:kotlin.String) returnType:<root>.TestAnn [primary] 
       VALUE_PARAMETER name:x index:0 type:kotlin.String 

compiler/testData/ir/irText/declarations/annotations/typeParametersWithAnnotations.txt

@@ -1,9 +1,7 @@
 FILE fqName:<root> fileName:/typeParametersWithAnnotations.kt
   CLASS ANNOTATION_CLASS name:Anno modality:FINAL visibility:public superTypes:[kotlin.Annotation]
     annotations:
-      CALL 'public constructor <init> (vararg allowedTargets: kotlin.annotation.AnnotationTarget) [primary] declared in kotlin.annotation.Target' type=kotlin.annotation.Target origin=null
-        allowedTargets: VARARG type=kotlin.Array<out kotlin.annotation.AnnotationTarget> varargElementType=kotlin.annotation.AnnotationTarget
-          GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:TYPE_PARAMETER' type=kotlin.annotation.AnnotationTarget
+      Target(allowedTargets = [GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:TYPE_PARAMETER' type=kotlin.annotation.AnnotationTarget])
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Anno 
     CONSTRUCTOR visibility:public <> () returnType:<root>.Anno [primary] 
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
@@ -22,5 +20,5 @@ FILE fqName:<root> fileName:/typeParametersWithAnnotations.kt
   FUN name:foo visibility:public modality:FINAL <T> () returnType:kotlin.Unit 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
       annotations:
-        CALL 'public constructor <init> () [primary] declared in <root>.Anno' type=<root>.Anno origin=null
+        Anno
     BLOCK_BODY

compiler/testData/ir/irText/declarations/annotations/valueParametersWithAnnotations.txt

@@ -30,16 +30,14 @@ FILE fqName:<root> fileName:/valueParametersWithAnnotations.kt
   FUN name:testFun visibility:public modality:FINAL <> (x:kotlin.Int) returnType:kotlin.Unit 
     VALUE_PARAMETER name:x index:0 type:kotlin.Int 
       annotations:
-        CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-          x: CONST String type=kotlin.String value="testFun.x"
+        TestAnn(x = 'testFun.x')
     BLOCK_BODY
   CLASS CLASS name:TestClassConstructor1 modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestClassConstructor1 
     CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:<root>.TestClassConstructor1 [primary] 
       VALUE_PARAMETER name:x index:0 type:kotlin.Int 
         annotations:
-          CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-            x: CONST String type=kotlin.String value="TestClassConstructor1.x"
+          TestAnn(x = 'TestClassConstructor1.x')
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestClassConstructor1 modality:FINAL visibility:public superTypes:[kotlin.Any]'

compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.txt

@@ -85,88 +85,13 @@ FILE fqName:<root> fileName:/varargsInAnnotationArguments.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public constructor <init> (vararg xs: kotlin.Int) [primary] declared in <root>.A1' type=<root>.A1 origin=null
-        xs: VARARG type=kotlin.IntArray varargElementType=kotlin.Int
-          CONST Int type=kotlin.Int value=1
-          CONST Int type=kotlin.Int value=2
-          CONST Int type=kotlin.Int value=3
-      CALL 'public constructor <init> (vararg xs: kotlin.String) [primary] declared in <root>.A2' type=<root>.A2 origin=null
-        xs: VARARG type=kotlin.Array<out kotlin.String> varargElementType=kotlin.String
-          CONST String type=kotlin.String value="a"
-          CONST String type=kotlin.String value="b"
-          CONST String type=kotlin.String value="c"
-      CALL 'public constructor <init> (vararg xs: <root>.A1) [primary] declared in <root>.AA' type=<root>.AA origin=null
-        xs: VARARG type=kotlin.Array<out <root>.A1> varargElementType=<root>.A1
-          CALL 'public constructor <init> (vararg xs: kotlin.Int) [primary] declared in <root>.A1' type=<root>.A1 origin=null
-            xs: VARARG type=kotlin.IntArray varargElementType=kotlin.Int
-              CONST Int type=kotlin.Int value=4
-          CALL 'public constructor <init> (vararg xs: kotlin.Int) [primary] declared in <root>.A1' type=<root>.A1 origin=null
-            xs: VARARG type=kotlin.IntArray varargElementType=kotlin.Int
-              CONST Int type=kotlin.Int value=5
-          CALL 'public constructor <init> (vararg xs: kotlin.Int) [primary] declared in <root>.A1' type=<root>.A1 origin=null
-            xs: VARARG type=kotlin.IntArray varargElementType=kotlin.Int
-              CONST Int type=kotlin.Int value=6
-      CALL 'public constructor <init> (vararg xs: kotlin.Int) [primary] declared in <root>.A1' type=<root>.A1 origin=null
-        xs: VARARG type=kotlin.IntArray varargElementType=kotlin.Int
-          CONST Int type=kotlin.Int value=1
-          CONST Int type=kotlin.Int value=2
-          CONST Int type=kotlin.Int value=3
-      CALL 'public constructor <init> (vararg xs: kotlin.String) [primary] declared in <root>.A2' type=<root>.A2 origin=null
-        xs: VARARG type=kotlin.Array<out kotlin.String> varargElementType=kotlin.String
-          CONST String type=kotlin.String value="a"
-          CONST String type=kotlin.String value="b"
-          CONST String type=kotlin.String value="c"
-      CALL 'public constructor <init> (vararg xs: <root>.A1) [primary] declared in <root>.AA' type=<root>.AA origin=null
-        xs: VARARG type=kotlin.Array<out <root>.A1> varargElementType=<root>.A1
-          CALL 'public constructor <init> (vararg xs: kotlin.Int) [primary] declared in <root>.A1' type=<root>.A1 origin=null
-            xs: VARARG type=kotlin.IntArray varargElementType=kotlin.Int
-              CONST Int type=kotlin.Int value=4
-          CALL 'public constructor <init> (vararg xs: kotlin.Int) [primary] declared in <root>.A1' type=<root>.A1 origin=null
-            xs: VARARG type=kotlin.IntArray varargElementType=kotlin.Int
-              CONST Int type=kotlin.Int value=5
-          CALL 'public constructor <init> (vararg xs: kotlin.Int) [primary] declared in <root>.A1' type=<root>.A1 origin=null
-            xs: VARARG type=kotlin.IntArray varargElementType=kotlin.Int
-              CONST Int type=kotlin.Int value=6
-      CALL 'public constructor <init> (vararg xs: kotlin.Int) [primary] declared in <root>.A1' type=<root>.A1 origin=null
-        xs: VARARG type=kotlin.IntArray varargElementType=kotlin.Int
-          CONST Int type=kotlin.Int value=1
-          CONST Int type=kotlin.Int value=2
-          CONST Int type=kotlin.Int value=3
-      CALL 'public constructor <init> (vararg xs: kotlin.String) [primary] declared in <root>.A2' type=<root>.A2 origin=null
-        xs: VARARG type=kotlin.Array<out kotlin.String> varargElementType=kotlin.String
-          CONST String type=kotlin.String value="a"
-          CONST String type=kotlin.String value="b"
-          CONST String type=kotlin.String value="c"
-      CALL 'public constructor <init> (vararg xs: <root>.A1) [primary] declared in <root>.AA' type=<root>.AA origin=null
-        xs: VARARG type=kotlin.Array<out <root>.A1> varargElementType=<root>.A1
-          CALL 'public constructor <init> (vararg xs: kotlin.Int) [primary] declared in <root>.A1' type=<root>.A1 origin=null
-            xs: VARARG type=kotlin.IntArray varargElementType=kotlin.Int
-              CONST Int type=kotlin.Int value=4
-          CALL 'public constructor <init> (vararg xs: kotlin.Int) [primary] declared in <root>.A1' type=<root>.A1 origin=null
-            xs: VARARG type=kotlin.IntArray varargElementType=kotlin.Int
-              CONST Int type=kotlin.Int value=5
-          CALL 'public constructor <init> (vararg xs: kotlin.Int) [primary] declared in <root>.A1' type=<root>.A1 origin=null
-            xs: VARARG type=kotlin.IntArray varargElementType=kotlin.Int
-              CONST Int type=kotlin.Int value=6
+      A1(xs = ['1', '2', '3'])
+      A2(xs = ['a', 'b', 'c'])
+      AA(xs = [A1(xs = ['4']), A1(xs = ['5']), A1(xs = ['6'])])
     BLOCK_BODY
   FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     annotations:
-      CALL 'public constructor <init> (vararg xs: kotlin.Int) [primary] declared in <root>.A1' type=<root>.A1 origin=null
-        xs: VARARG type=kotlin.IntArray varargElementType=kotlin.Int
-      CALL 'public constructor <init> (vararg xs: kotlin.String) [primary] declared in <root>.A2' type=<root>.A2 origin=null
-        xs: VARARG type=kotlin.Array<out kotlin.String> varargElementType=kotlin.String
-      CALL 'public constructor <init> (vararg xs: <root>.A1) [primary] declared in <root>.AA' type=<root>.AA origin=null
-        xs: VARARG type=kotlin.Array<out <root>.A1> varargElementType=<root>.A1
-      CALL 'public constructor <init> (vararg xs: kotlin.Int) [primary] declared in <root>.A1' type=<root>.A1 origin=null
-        xs: VARARG type=kotlin.IntArray varargElementType=kotlin.Int
-      CALL 'public constructor <init> (vararg xs: kotlin.String) [primary] declared in <root>.A2' type=<root>.A2 origin=null
-        xs: VARARG type=kotlin.Array<out kotlin.String> varargElementType=kotlin.String
-      CALL 'public constructor <init> (vararg xs: <root>.A1) [primary] declared in <root>.AA' type=<root>.AA origin=null
-        xs: VARARG type=kotlin.Array<out <root>.A1> varargElementType=<root>.A1
-      CALL 'public constructor <init> (vararg xs: kotlin.Int) [primary] declared in <root>.A1' type=<root>.A1 origin=null
-        xs: VARARG type=kotlin.IntArray varargElementType=kotlin.Int
-      CALL 'public constructor <init> (vararg xs: kotlin.String) [primary] declared in <root>.A2' type=<root>.A2 origin=null
-        xs: VARARG type=kotlin.Array<out kotlin.String> varargElementType=kotlin.String
-      CALL 'public constructor <init> (vararg xs: <root>.A1) [primary] declared in <root>.AA' type=<root>.AA origin=null
-        xs: VARARG type=kotlin.Array<out <root>.A1> varargElementType=<root>.A1
+      A1(xs = [])
+      A2(xs = [])
+      AA(xs = [])
     BLOCK_BODY

compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.txt

@@ -31,11 +31,9 @@ FILE fqName:<root> fileName:/variablesWithAnnotations.kt
     BLOCK_BODY
       VAR name:testVal type:kotlin.String [val] 
         annotations:
-          CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-            x: CONST String type=kotlin.String value="foo/testVal"
+          TestAnn(x = 'foo/testVal')
         CONST String type=kotlin.String value="testVal"
       VAR name:testVar type:kotlin.String [var] 
         annotations:
-          CALL 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.TestAnn' type=<root>.TestAnn origin=null
-            x: CONST String type=kotlin.String value="foo/testVar"
+          TestAnn(x = 'foo/testVar')
         CONST String type=kotlin.String value="testVar"

compiler/testData/ir/irText/declarations/fileWithAnnotations.txt

@@ -1,7 +1,6 @@
 FILE fqName:<root> fileName:/fileWithAnnotations.kt
   annotations:
-    CALL 'public constructor <init> (name: kotlin.String) [primary] declared in kotlin.jvm.JvmName' type=kotlin.jvm.JvmName origin=null
-      name: CONST String type=kotlin.String value="FileWithAnnotations"
+    JvmName(name = 'FileWithAnnotations')
   FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
   PROPERTY name:bar visibility:public modality:FINAL [val] 

compiler/testData/ir/irText/declarations/parameters/lambdas.txt

@@ -15,9 +15,9 @@ FILE fqName:<root> fileName:/lambdas.kt
         RETURN type=kotlin.Nothing from='public final fun <get-test1> (): kotlin.Function1<kotlin.String, kotlin.String> declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1<kotlin.String, kotlin.String> visibility:public [final,static] ' type=kotlin.Function1<kotlin.String, kotlin.String> origin=null
   PROPERTY name:test2 visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test2 type:@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Any> visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test2 type:@[ExtensionFunctionType] kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Any> visibility:public [final,static] 
       EXPRESSION_BODY
-        BLOCK type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Int> origin=LAMBDA
+        BLOCK type=@[ExtensionFunctionType] kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Int> origin=LAMBDA
           FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:kotlin.Any, it:kotlin.Any) returnType:kotlin.Int 
             $receiver: VALUE_PARAMETER name:<this> type:kotlin.Any 
             VALUE_PARAMETER name:it index:0 type:kotlin.Any 
@@ -25,12 +25,12 @@ FILE fqName:<root> fileName:/lambdas.kt
               RETURN type=kotlin.Nothing from='local final fun <anonymous> (it: kotlin.Any): kotlin.Int declared in <root>.test2'
                 CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
                   $this: GET_VAR 'it: kotlin.Any declared in <root>.test2.<anonymous>' type=kotlin.Any origin=null
-          FUNCTION_REFERENCE 'local final fun <anonymous> (it: kotlin.Any): kotlin.Int declared in <root>.test2' type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Int> origin=LAMBDA
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Any> 
+          FUNCTION_REFERENCE 'local final fun <anonymous> (it: kotlin.Any): kotlin.Int declared in <root>.test2' type=@[ExtensionFunctionType] kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Int> origin=LAMBDA
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:@[ExtensionFunctionType] kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Any> 
       correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test2> (): @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Any> declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Any> visibility:public [final,static] ' type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Any> origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test2> (): @[ExtensionFunctionType] kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Any> declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:@[ExtensionFunctionType] kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Any> visibility:public [final,static] ' type=@[ExtensionFunctionType] kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Any> origin=null
   PROPERTY name:test3 visibility:public modality:FINAL [val] 
     FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Function2<kotlin.Int, kotlin.Int, kotlin.Unit> visibility:public [final,static] 
       EXPRESSION_BODY

compiler/testData/ir/irText/expressions/callableReferenceTypeArguments.txt

@@ -34,7 +34,7 @@ FILE fqName:<root> fileName:/callableReferenceTypeArguments.kt
   PROPERTY name:test1 visibility:public modality:FINAL [val] 
     FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1<kotlin.Int, kotlin.Unit> visibility:public [final,static] 
       EXPRESSION_BODY
-        FUNCTION_REFERENCE 'public final fun topLevel1 <T> (x: T of <root>.topLevel1): kotlin.Unit [inline] declared in <root>' type=kotlin.reflect.KFunction1<@[CALL 'public constructor <init> (name: kotlin.String) [primary] declared in kotlin.ParameterName' type=kotlin.ParameterName origin=null] kotlin.Int, kotlin.Unit> origin=null
+        FUNCTION_REFERENCE 'public final fun topLevel1 <T> (x: T of <root>.topLevel1): kotlin.Unit [inline] declared in <root>' type=kotlin.reflect.KFunction1<@[ParameterName(name = 'x')] kotlin.Int, kotlin.Unit> origin=null
           <T>: kotlin.Int
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:kotlin.Function1<kotlin.Int, kotlin.Unit> 
       correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] 
@@ -44,7 +44,7 @@ FILE fqName:<root> fileName:/callableReferenceTypeArguments.kt
   PROPERTY name:test2 visibility:public modality:FINAL [val] 
     FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function1<kotlin.collections.List<kotlin.String>, kotlin.Unit> visibility:public [final,static] 
       EXPRESSION_BODY
-        FUNCTION_REFERENCE 'public final fun topLevel2 <T> (x: kotlin.collections.List<T of <root>.topLevel2>): kotlin.Unit [inline] declared in <root>' type=kotlin.reflect.KFunction1<@[CALL 'public constructor <init> (name: kotlin.String) [primary] declared in kotlin.ParameterName' type=kotlin.ParameterName origin=null] kotlin.collections.List<kotlin.String>, kotlin.Unit> origin=null
+        FUNCTION_REFERENCE 'public final fun topLevel2 <T> (x: kotlin.collections.List<T of <root>.topLevel2>): kotlin.Unit [inline] declared in <root>' type=kotlin.reflect.KFunction1<@[ParameterName(name = 'x')] kotlin.collections.List<kotlin.String>, kotlin.Unit> origin=null
           <T>: kotlin.String
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:kotlin.Function1<kotlin.collections.List<kotlin.String>, kotlin.Unit> 
       correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] 
@@ -54,7 +54,7 @@ FILE fqName:<root> fileName:/callableReferenceTypeArguments.kt
   PROPERTY name:test3 visibility:public modality:FINAL [val] 
     FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Function1<kotlin.Int, kotlin.Unit> visibility:public [final,static] 
       EXPRESSION_BODY
-        FUNCTION_REFERENCE 'public final fun objectMember <T> (x: T of <root>.Host.objectMember): kotlin.Unit [inline] declared in <root>.Host' type=kotlin.reflect.KFunction1<@[CALL 'public constructor <init> (name: kotlin.String) [primary] declared in kotlin.ParameterName' type=kotlin.ParameterName origin=null] kotlin.Int, kotlin.Unit> origin=null
+        FUNCTION_REFERENCE 'public final fun objectMember <T> (x: T of <root>.Host.objectMember): kotlin.Unit [inline] declared in <root>.Host' type=kotlin.reflect.KFunction1<@[ParameterName(name = 'x')] kotlin.Int, kotlin.Unit> origin=null
           <T>: kotlin.Int
           $this: GET_OBJECT 'CLASS OBJECT name:Host modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.Host
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> () returnType:kotlin.Function1<kotlin.Int, kotlin.Unit> 

compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.txt

@@ -1,58 +1,60 @@
 FILE fqName:<root> fileName:/constructorWithOwnTypeParametersCall.kt
-  FUN name:testKotlin visibility:public modality:FINAL <> () returnType:<root>.K1.K2<kotlin.String, kotlin.Int>
+  FUN name:testKotlin visibility:public modality:FINAL <> () returnType:<root>.K1.K2<kotlin.String, kotlin.Int> 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun testKotlin (): <root>.K1.K2<kotlin.String, kotlin.Int> declared in <root>'
         CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.K1.K2' type=<root>.K1.K2<kotlin.String, kotlin.Int> origin=null
           <class: T2>: kotlin.String
-          $outer: CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.K1' type=<root>.K1<kotlin.Int> origin=null
-            <class: T1>: kotlin.Int
-  FUN name:testJava visibility:public modality:FINAL <> () returnType:<root>.J1.J2<kotlin.Double, kotlin.Int>
+          $outer: TYPE_OP type=<root>.K1<T1 of <root>.K1> origin=IMPLICIT_CAST typeOperand=<root>.K1<T1 of <root>.K1>
+            CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.K1' type=<root>.K1<kotlin.Int> origin=null
+              <class: T1>: kotlin.Int
+  FUN name:testJava visibility:public modality:FINAL <> () returnType:<root>.J1.J2<kotlin.Double, kotlin.Int> 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun testJava (): <root>.J1.J2<kotlin.Double, kotlin.Int> declared in <root>'
         CONSTRUCTOR_CALL 'public constructor <init> <Y2> () declared in <root>.J1.J2' type=<root>.J1.J2<kotlin.Double, kotlin.Int> origin=null
           <class: X2>: kotlin.Double
           <Y2>: kotlin.CharSequence
-          $outer: CONSTRUCTOR_CALL 'public constructor <init> <Y1> () declared in <root>.J1' type=<root>.J1<kotlin.Int> origin=null
-            <class: X1>: kotlin.Int
-            <Y1>: kotlin.String
+          $outer: TYPE_OP type=<root>.J1<X1 of <root>.J1> origin=IMPLICIT_CAST typeOperand=<root>.J1<X1 of <root>.J1>
+            CONSTRUCTOR_CALL 'public constructor <init> <Y1> () declared in <root>.J1' type=<root>.J1<kotlin.Int> origin=null
+              <class: X1>: kotlin.Int
+              <Y1>: kotlin.String
   CLASS CLASS name:K1 modality:FINAL visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.K1<T1 of <root>.K1>
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.K1<T1 of <root>.K1> 
     TYPE_PARAMETER name:T1 index:0 variance: superTypes:[kotlin.Number]
-    CONSTRUCTOR visibility:public <> () returnType:<root>.K1<T1 of <root>.K1> [primary]
+    CONSTRUCTOR visibility:public <> () returnType:<root>.K1<T1 of <root>.K1> [primary] 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:K1 modality:FINAL visibility:public superTypes:[kotlin.Any]'
     CLASS CLASS name:K2 modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.K1.K2<T2 of <root>.K1.K2, T1 of <root>.K1>
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.K1.K2<T2 of <root>.K1.K2, T1 of <root>.K1> 
       TYPE_PARAMETER name:T2 index:0 variance: superTypes:[kotlin.CharSequence]
-      CONSTRUCTOR visibility:public <> ($this:<root>.K1<T1 of <root>.K1>) returnType:<root>.K1.K2<T2 of <root>.K1.K2, T1 of <root>.K1> [primary]
-        $outer: VALUE_PARAMETER name:<this> type:<root>.K1<T1 of <root>.K1>
+      CONSTRUCTOR visibility:public <> ($this:<root>.K1<T1 of <root>.K1>) returnType:<root>.K1.K2<T2 of <root>.K1.K2, T1 of <root>.K1> [primary] 
+        $outer: VALUE_PARAMETER name:<this> type:<root>.K1<T1 of <root>.K1> 
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
           INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:K2 modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]'
-      FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
+      FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
         overridden:
           public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+        VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
+      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
         overridden:
           public open fun hashCode (): kotlin.Int declared in kotlin.Any
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
         overridden:
           public open fun toString (): kotlin.String declared in kotlin.Any
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 

compiler/testData/ir/irText/expressions/extFunInvokeAsFun.txt

@@ -1,17 +1,17 @@
 FILE fqName:<root> fileName:/extFunInvokeAsFun.kt
-  FUN name:with1 visibility:public modality:FINAL <> (receiver:kotlin.Any?, block:@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<kotlin.Any?, kotlin.Unit>) returnType:kotlin.Unit 
+  FUN name:with1 visibility:public modality:FINAL <> (receiver:kotlin.Any?, block:@[ExtensionFunctionType] kotlin.Function1<kotlin.Any?, kotlin.Unit>) returnType:kotlin.Unit 
     VALUE_PARAMETER name:receiver index:0 type:kotlin.Any? 
-    VALUE_PARAMETER name:block index:1 type:@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<kotlin.Any?, kotlin.Unit> 
+    VALUE_PARAMETER name:block index:1 type:@[ExtensionFunctionType] kotlin.Function1<kotlin.Any?, kotlin.Unit> 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun with1 (receiver: kotlin.Any?, block: @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<kotlin.Any?, kotlin.Unit>): kotlin.Unit declared in <root>'
+      RETURN type=kotlin.Nothing from='public final fun with1 (receiver: kotlin.Any?, block: @[ExtensionFunctionType] kotlin.Function1<kotlin.Any?, kotlin.Unit>): kotlin.Unit declared in <root>'
         CALL 'public abstract fun invoke (p1: P1 of kotlin.Function1): R of kotlin.Function1 declared in kotlin.Function1' type=kotlin.Unit origin=INVOKE
-          $this: GET_VAR 'block: @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<kotlin.Any?, kotlin.Unit> declared in <root>.with1' type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<kotlin.Any?, kotlin.Unit> origin=VARIABLE_AS_FUNCTION
+          $this: GET_VAR 'block: @[ExtensionFunctionType] kotlin.Function1<kotlin.Any?, kotlin.Unit> declared in <root>.with1' type=@[ExtensionFunctionType] kotlin.Function1<kotlin.Any?, kotlin.Unit> origin=VARIABLE_AS_FUNCTION
           p1: GET_VAR 'receiver: kotlin.Any? declared in <root>.with1' type=kotlin.Any? origin=null
-  FUN name:with2 visibility:public modality:FINAL <> (receiver:kotlin.Any?, block:@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<kotlin.Any?, kotlin.Unit>) returnType:kotlin.Unit 
+  FUN name:with2 visibility:public modality:FINAL <> (receiver:kotlin.Any?, block:@[ExtensionFunctionType] kotlin.Function1<kotlin.Any?, kotlin.Unit>) returnType:kotlin.Unit 
     VALUE_PARAMETER name:receiver index:0 type:kotlin.Any? 
-    VALUE_PARAMETER name:block index:1 type:@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<kotlin.Any?, kotlin.Unit> 
+    VALUE_PARAMETER name:block index:1 type:@[ExtensionFunctionType] kotlin.Function1<kotlin.Any?, kotlin.Unit> 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun with2 (receiver: kotlin.Any?, block: @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<kotlin.Any?, kotlin.Unit>): kotlin.Unit declared in <root>'
+      RETURN type=kotlin.Nothing from='public final fun with2 (receiver: kotlin.Any?, block: @[ExtensionFunctionType] kotlin.Function1<kotlin.Any?, kotlin.Unit>): kotlin.Unit declared in <root>'
         CALL 'public abstract fun invoke (p1: P1 of kotlin.Function1): R of kotlin.Function1 declared in kotlin.Function1' type=kotlin.Unit origin=INVOKE
-          $this: GET_VAR 'block: @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<kotlin.Any?, kotlin.Unit> declared in <root>.with2' type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<kotlin.Any?, kotlin.Unit> origin=VARIABLE_AS_FUNCTION
+          $this: GET_VAR 'block: @[ExtensionFunctionType] kotlin.Function1<kotlin.Any?, kotlin.Unit> declared in <root>.with2' type=@[ExtensionFunctionType] kotlin.Function1<kotlin.Any?, kotlin.Unit> origin=VARIABLE_AS_FUNCTION
           p1: GET_VAR 'receiver: kotlin.Any? declared in <root>.with2' type=kotlin.Any? origin=null

compiler/testData/ir/irText/expressions/extFunSafeInvoke.txt

@@ -1,9 +1,9 @@
 FILE fqName:<root> fileName:/extFunSafeInvoke.kt
-  FUN name:test visibility:public modality:FINAL <> (receiver:kotlin.Any?, fn:@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function3<kotlin.Any, kotlin.Int, kotlin.String, kotlin.Unit>) returnType:kotlin.Unit? 
+  FUN name:test visibility:public modality:FINAL <> (receiver:kotlin.Any?, fn:@[ExtensionFunctionType] kotlin.Function3<kotlin.Any, kotlin.Int, kotlin.String, kotlin.Unit>) returnType:kotlin.Unit? 
     VALUE_PARAMETER name:receiver index:0 type:kotlin.Any? 
-    VALUE_PARAMETER name:fn index:1 type:@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function3<kotlin.Any, kotlin.Int, kotlin.String, kotlin.Unit> 
+    VALUE_PARAMETER name:fn index:1 type:@[ExtensionFunctionType] kotlin.Function3<kotlin.Any, kotlin.Int, kotlin.String, kotlin.Unit> 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test (receiver: kotlin.Any?, fn: @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function3<kotlin.Any, kotlin.Int, kotlin.String, kotlin.Unit>): kotlin.Unit? declared in <root>'
+      RETURN type=kotlin.Nothing from='public final fun test (receiver: kotlin.Any?, fn: @[ExtensionFunctionType] kotlin.Function3<kotlin.Any, kotlin.Int, kotlin.String, kotlin.Unit>): kotlin.Unit? declared in <root>'
         BLOCK type=kotlin.Unit? origin=SAFE_CALL
           VAR IR_TEMPORARY_VARIABLE name:tmp0_safe_receiver type:kotlin.Any? [val] 
             GET_VAR 'receiver: kotlin.Any? declared in <root>.test' type=kotlin.Any? origin=null
@@ -16,7 +16,7 @@ FILE fqName:<root> fileName:/extFunSafeInvoke.kt
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
               then: CALL 'public abstract fun invoke (p1: P1 of kotlin.Function3, p2: P2 of kotlin.Function3, p3: P3 of kotlin.Function3): R of kotlin.Function3 declared in kotlin.Function3' type=kotlin.Unit origin=INVOKE
-                $this: GET_VAR 'fn: @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function3<kotlin.Any, kotlin.Int, kotlin.String, kotlin.Unit> declared in <root>.test' type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function3<kotlin.Any, kotlin.Int, kotlin.String, kotlin.Unit> origin=VARIABLE_AS_FUNCTION
+                $this: GET_VAR 'fn: @[ExtensionFunctionType] kotlin.Function3<kotlin.Any, kotlin.Int, kotlin.String, kotlin.Unit> declared in <root>.test' type=@[ExtensionFunctionType] kotlin.Function3<kotlin.Any, kotlin.Int, kotlin.String, kotlin.Unit> origin=VARIABLE_AS_FUNCTION
                 p1: GET_VAR 'val tmp0_safe_receiver: kotlin.Any? [val] declared in <root>.test' type=kotlin.Any? origin=null
                 p2: CONST Int type=kotlin.Int value=42
                 p3: CONST String type=kotlin.String value="Hello"

compiler/testData/ir/irText/expressions/signedToUnsignedConversions_test.txt

@@ -1,7 +1,7 @@
 FILE fqName:<root> fileName:/signedToUnsignedConversions_test.kt
   PROPERTY name:IMPLICIT_INT visibility:public modality:FINAL [const,val] 
     annotations:
-      CALL 'public constructor <init> () [primary] declared in kotlin.internal.ImplicitIntegerCoercion' type=kotlin.internal.ImplicitIntegerCoercion origin=null
+      ImplicitIntegerCoercion
     FIELD PROPERTY_BACKING_FIELD name:IMPLICIT_INT type:kotlin.Int visibility:public [final,static] 
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=255
@@ -12,7 +12,7 @@ FILE fqName:<root> fileName:/signedToUnsignedConversions_test.kt
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:IMPLICIT_INT type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
   PROPERTY name:EXPLICIT_INT visibility:public modality:FINAL [const,val] 
     annotations:
-      CALL 'public constructor <init> () [primary] declared in kotlin.internal.ImplicitIntegerCoercion' type=kotlin.internal.ImplicitIntegerCoercion origin=null
+      ImplicitIntegerCoercion
     FIELD PROPERTY_BACKING_FIELD name:EXPLICIT_INT type:kotlin.Int visibility:public [final,static] 
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=255
@@ -23,7 +23,7 @@ FILE fqName:<root> fileName:/signedToUnsignedConversions_test.kt
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:EXPLICIT_INT type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
   PROPERTY name:LONG_CONST visibility:public modality:FINAL [const,val] 
     annotations:
-      CALL 'public constructor <init> () [primary] declared in kotlin.internal.ImplicitIntegerCoercion' type=kotlin.internal.ImplicitIntegerCoercion origin=null
+      ImplicitIntegerCoercion
     FIELD PROPERTY_BACKING_FIELD name:LONG_CONST type:kotlin.Long visibility:public [final,static] 
       EXPRESSION_BODY
         CONST Long type=kotlin.Long value=255
@@ -34,7 +34,7 @@ FILE fqName:<root> fileName:/signedToUnsignedConversions_test.kt
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:LONG_CONST type:kotlin.Long visibility:public [final,static] ' type=kotlin.Long origin=null
   PROPERTY name:NON_CONST visibility:public modality:FINAL [val] 
     annotations:
-      CALL 'public constructor <init> () [primary] declared in kotlin.internal.ImplicitIntegerCoercion' type=kotlin.internal.ImplicitIntegerCoercion origin=null
+      ImplicitIntegerCoercion
     FIELD PROPERTY_BACKING_FIELD name:NON_CONST type:kotlin.Int visibility:public [final,static] 
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=255
@@ -45,7 +45,7 @@ FILE fqName:<root> fileName:/signedToUnsignedConversions_test.kt
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:NON_CONST type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
   PROPERTY name:BIGGER_THAN_UBYTE visibility:public modality:FINAL [const,val] 
     annotations:
-      CALL 'public constructor <init> () [primary] declared in kotlin.internal.ImplicitIntegerCoercion' type=kotlin.internal.ImplicitIntegerCoercion origin=null
+      ImplicitIntegerCoercion
     FIELD PROPERTY_BACKING_FIELD name:BIGGER_THAN_UBYTE type:kotlin.Int visibility:public [final,static] 
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=256
@@ -56,7 +56,7 @@ FILE fqName:<root> fileName:/signedToUnsignedConversions_test.kt
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:BIGGER_THAN_UBYTE type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
   PROPERTY name:UINT_CONST visibility:public modality:FINAL [const,val] 
     annotations:
-      CALL 'public constructor <init> () [primary] declared in kotlin.internal.ImplicitIntegerCoercion' type=kotlin.internal.ImplicitIntegerCoercion origin=null
+      ImplicitIntegerCoercion
     FIELD PROPERTY_BACKING_FIELD name:UINT_CONST type:kotlin.UInt visibility:public [final,static] 
       EXPRESSION_BODY
         CONST Int type=kotlin.UInt value=42
@@ -68,32 +68,32 @@ FILE fqName:<root> fileName:/signedToUnsignedConversions_test.kt
   FUN name:takeUByte visibility:public modality:FINAL <> (u:kotlin.UByte) returnType:kotlin.Unit 
     VALUE_PARAMETER name:u index:0 type:kotlin.UByte 
       annotations:
-        CALL 'public constructor <init> () [primary] declared in kotlin.internal.ImplicitIntegerCoercion' type=kotlin.internal.ImplicitIntegerCoercion origin=null
+        ImplicitIntegerCoercion
     BLOCK_BODY
   FUN name:takeUShort visibility:public modality:FINAL <> (u:kotlin.UShort) returnType:kotlin.Unit 
     VALUE_PARAMETER name:u index:0 type:kotlin.UShort 
       annotations:
-        CALL 'public constructor <init> () [primary] declared in kotlin.internal.ImplicitIntegerCoercion' type=kotlin.internal.ImplicitIntegerCoercion origin=null
+        ImplicitIntegerCoercion
     BLOCK_BODY
   FUN name:takeUInt visibility:public modality:FINAL <> (u:kotlin.UInt) returnType:kotlin.Unit 
     VALUE_PARAMETER name:u index:0 type:kotlin.UInt 
       annotations:
-        CALL 'public constructor <init> () [primary] declared in kotlin.internal.ImplicitIntegerCoercion' type=kotlin.internal.ImplicitIntegerCoercion origin=null
+        ImplicitIntegerCoercion
     BLOCK_BODY
   FUN name:takeULong visibility:public modality:FINAL <> (u:kotlin.ULong) returnType:kotlin.Unit 
     VALUE_PARAMETER name:u index:0 type:kotlin.ULong 
       annotations:
-        CALL 'public constructor <init> () [primary] declared in kotlin.internal.ImplicitIntegerCoercion' type=kotlin.internal.ImplicitIntegerCoercion origin=null
+        ImplicitIntegerCoercion
     BLOCK_BODY
   FUN name:takeUBytes visibility:public modality:FINAL <> (u:kotlin.UByteArray) returnType:kotlin.Unit 
     VALUE_PARAMETER name:u index:0 type:kotlin.UByteArray varargElementType:kotlin.UByte [vararg] 
       annotations:
-        CALL 'public constructor <init> () [primary] declared in kotlin.internal.ImplicitIntegerCoercion' type=kotlin.internal.ImplicitIntegerCoercion origin=null
+        ImplicitIntegerCoercion
     BLOCK_BODY
   FUN name:takeLong visibility:public modality:FINAL <> (l:kotlin.Long) returnType:kotlin.Unit 
     VALUE_PARAMETER name:l index:0 type:kotlin.Long 
       annotations:
-        CALL 'public constructor <init> () [primary] declared in kotlin.internal.ImplicitIntegerCoercion' type=kotlin.internal.ImplicitIntegerCoercion origin=null
+        ImplicitIntegerCoercion
     BLOCK_BODY
   FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY

compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.txt

@@ -36,4 +36,5 @@ FILE fqName:<root> fileName:/specializedTypeAliasConstructorCall.kt
       RETURN type=kotlin.Nothing from='public final fun test (): <root>.Cell<kotlin.Int> declared in <root>'
         CONSTRUCTOR_CALL 'public constructor <init> (value: T of <root>.Cell) [primary] declared in <root>.Cell' type=<root>.Cell<kotlin.Int> origin=null
           <class: T>: kotlin.Int
-          value: CONST Int type=kotlin.Int value=42
+          value: TYPE_OP type=T of <root>.Cell origin=IMPLICIT_CAST typeOperand=T of <root>.Cell
+            CONST Int type=kotlin.Int value=42

compiler/testData/ir/irText/expressions/variableAsFunctionCall.txt

@@ -15,12 +15,12 @@ FILE fqName:<root> fileName:/variableAsFunctionCall.kt
       RETURN type=kotlin.Nothing from='public final fun test1 (f: kotlin.Function0<kotlin.Unit>): kotlin.Unit declared in <root>'
         CALL 'public abstract fun invoke (): R of kotlin.Function0 declared in kotlin.Function0' type=kotlin.Unit origin=INVOKE
           $this: GET_VAR 'f: kotlin.Function0<kotlin.Unit> declared in <root>.test1' type=kotlin.Function0<kotlin.Unit> origin=VARIABLE_AS_FUNCTION
-  FUN name:test2 visibility:public modality:FINAL <> (f:@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<kotlin.String, kotlin.Unit>) returnType:kotlin.Unit 
-    VALUE_PARAMETER name:f index:0 type:@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<kotlin.String, kotlin.Unit> 
+  FUN name:test2 visibility:public modality:FINAL <> (f:@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit>) returnType:kotlin.Unit 
+    VALUE_PARAMETER name:f index:0 type:@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit> 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test2 (f: @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<kotlin.String, kotlin.Unit>): kotlin.Unit declared in <root>'
+      RETURN type=kotlin.Nothing from='public final fun test2 (f: @[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit>): kotlin.Unit declared in <root>'
         CALL 'public abstract fun invoke (p1: P1 of kotlin.Function1): R of kotlin.Function1 declared in kotlin.Function1' type=kotlin.Unit origin=INVOKE
-          $this: GET_VAR 'f: @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<kotlin.String, kotlin.Unit> declared in <root>.test2' type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<kotlin.String, kotlin.Unit> origin=VARIABLE_AS_FUNCTION
+          $this: GET_VAR 'f: @[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit> declared in <root>.test2' type=@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit> origin=VARIABLE_AS_FUNCTION
           p1: CONST String type=kotlin.String value="hello"
   FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.String 
     BLOCK_BODY

compiler/testData/ir/irText/lambdas/extensionLambda.txt

@@ -2,15 +2,15 @@ FILE fqName:<root> fileName:/extensionLambda.kt
   FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Int 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test1 (): kotlin.Int declared in <root>'
-        CALL 'public final fun run <T, R> (block: @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<T of kotlin.run, R of kotlin.run>): R of kotlin.run [inline] declared in kotlin' type=kotlin.Int origin=null
+        CALL 'public final fun run <T, R> (block: @[ExtensionFunctionType] kotlin.Function1<T of kotlin.run, R of kotlin.run>): R of kotlin.run [inline] declared in kotlin' type=kotlin.Int origin=null
           <T>: kotlin.String
           <R>: kotlin.Int
           $receiver: CONST String type=kotlin.String value="42"
-          block: BLOCK type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<kotlin.String, kotlin.Int> origin=LAMBDA
+          block: BLOCK type=@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Int> origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:kotlin.String) returnType:kotlin.Int 
               $receiver: VALUE_PARAMETER name:<this> type:kotlin.String 
               BLOCK_BODY
                 RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Int declared in <root>.test1'
                   CALL 'public open fun <get-length> (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=GET_PROPERTY
                     $this: GET_VAR '<this>: kotlin.String declared in <root>.test1.<anonymous>' type=kotlin.String origin=null
-            FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Int declared in <root>.test1' type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<kotlin.String, kotlin.Int> origin=LAMBDA
+            FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Int declared in <root>.test1' type=@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Int> origin=LAMBDA

compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.txt

@@ -86,29 +86,29 @@ FILE fqName:<root> fileName:/multipleImplicitReceivers.kt
     VALUE_PARAMETER name:invokeImpl index:1 type:<root>.IInvoke 
     BLOCK_BODY
       TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
-        CALL 'public final fun with <T, R> (receiver: T of kotlin.with, block: @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<T of kotlin.with, R of kotlin.with>): R of kotlin.with [inline] declared in kotlin' type=kotlin.Int origin=null
+        CALL 'public final fun with <T, R> (receiver: T of kotlin.with, block: @[ExtensionFunctionType] kotlin.Function1<T of kotlin.with, R of kotlin.with>): R of kotlin.with [inline] declared in kotlin' type=kotlin.Int origin=null
           <T>: <root>.A
           <R>: kotlin.Int
           receiver: GET_OBJECT 'CLASS OBJECT name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.A
-          block: BLOCK type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<<root>.A, kotlin.Int> origin=LAMBDA
+          block: BLOCK type=@[ExtensionFunctionType] kotlin.Function1<<root>.A, kotlin.Int> origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:<root>.A) returnType:kotlin.Int 
               $receiver: VALUE_PARAMETER name:<this> type:<root>.A 
               BLOCK_BODY
                 RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Int declared in <root>.test'
-                  CALL 'public final fun with <T, R> (receiver: T of kotlin.with, block: @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<T of kotlin.with, R of kotlin.with>): R of kotlin.with [inline] declared in kotlin' type=kotlin.Int origin=null
+                  CALL 'public final fun with <T, R> (receiver: T of kotlin.with, block: @[ExtensionFunctionType] kotlin.Function1<T of kotlin.with, R of kotlin.with>): R of kotlin.with [inline] declared in kotlin' type=kotlin.Int origin=null
                     <T>: <root>.IFoo
                     <R>: kotlin.Int
                     receiver: GET_VAR 'fooImpl: <root>.IFoo declared in <root>.test' type=<root>.IFoo origin=null
-                    block: BLOCK type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<<root>.IFoo, kotlin.Int> origin=LAMBDA
+                    block: BLOCK type=@[ExtensionFunctionType] kotlin.Function1<<root>.IFoo, kotlin.Int> origin=LAMBDA
                       FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:<root>.IFoo) returnType:kotlin.Int 
                         $receiver: VALUE_PARAMETER name:<this> type:<root>.IFoo 
                         BLOCK_BODY
                           RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Int declared in <root>.test.<anonymous>'
-                            CALL 'public final fun with <T, R> (receiver: T of kotlin.with, block: @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<T of kotlin.with, R of kotlin.with>): R of kotlin.with [inline] declared in kotlin' type=kotlin.Int origin=null
+                            CALL 'public final fun with <T, R> (receiver: T of kotlin.with, block: @[ExtensionFunctionType] kotlin.Function1<T of kotlin.with, R of kotlin.with>): R of kotlin.with [inline] declared in kotlin' type=kotlin.Int origin=null
                               <T>: <root>.IInvoke
                               <R>: kotlin.Int
                               receiver: GET_VAR 'invokeImpl: <root>.IInvoke declared in <root>.test' type=<root>.IInvoke origin=null
-                              block: BLOCK type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<<root>.IInvoke, kotlin.Int> origin=LAMBDA
+                              block: BLOCK type=@[ExtensionFunctionType] kotlin.Function1<<root>.IInvoke, kotlin.Int> origin=LAMBDA
                                 FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:<root>.IInvoke) returnType:kotlin.Int 
                                   $receiver: VALUE_PARAMETER name:<this> type:<root>.IInvoke 
                                   BLOCK_BODY
@@ -118,6 +118,6 @@ FILE fqName:<root> fileName:/multipleImplicitReceivers.kt
                                         $receiver: CALL 'public open fun <get-foo> (): <root>.B declared in <root>.IFoo' type=<root>.B origin=GET_PROPERTY
                                           $this: GET_VAR '<this>: <root>.IFoo declared in <root>.test.<anonymous>.<anonymous>' type=<root>.IFoo origin=null
                                           $receiver: GET_VAR '<this>: <root>.A declared in <root>.test.<anonymous>' type=<root>.A origin=null
-                                FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Int declared in <root>.test.<anonymous>.<anonymous>' type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<<root>.IInvoke, kotlin.Int> origin=LAMBDA
-                      FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Int declared in <root>.test.<anonymous>' type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<<root>.IFoo, kotlin.Int> origin=LAMBDA
-            FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Int declared in <root>.test' type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<<root>.A, kotlin.Int> origin=LAMBDA
+                                FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Int declared in <root>.test.<anonymous>.<anonymous>' type=@[ExtensionFunctionType] kotlin.Function1<<root>.IInvoke, kotlin.Int> origin=LAMBDA
+                      FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Int declared in <root>.test.<anonymous>' type=@[ExtensionFunctionType] kotlin.Function1<<root>.IFoo, kotlin.Int> origin=LAMBDA
+            FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Int declared in <root>.test' type=@[ExtensionFunctionType] kotlin.Function1<<root>.A, kotlin.Int> origin=LAMBDA

compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.txt

@@ -36,8 +36,10 @@ FILE fqName:<root> fileName:/typeAliasCtorForGenericClass.kt
       VAR name:b type:<root>.A<kotlin.Int> [val] 
         CONSTRUCTOR_CALL 'public constructor <init> (q: Q of <root>.A) [primary] declared in <root>.A' type=<root>.A<kotlin.Int> origin=null
           <class: Q>: kotlin.Int
-          q: CONST Int type=kotlin.Int value=2
+          q: TYPE_OP type=Q of <root>.A origin=IMPLICIT_CAST typeOperand=Q of <root>.A
+            CONST Int type=kotlin.Int value=2
       VAR name:b2 type:<root>.A<<root>.A<kotlin.Int>> [val] 
         CONSTRUCTOR_CALL 'public constructor <init> (q: Q of <root>.A) [primary] declared in <root>.A' type=<root>.A<<root>.A<kotlin.Int>> origin=null
           <class: Q>: <root>.A<kotlin.Int>
-          q: GET_VAR 'val b: <root>.A<kotlin.Int> [val] declared in <root>.bar' type=<root>.A<kotlin.Int> origin=null
+          q: TYPE_OP type=Q of <root>.A origin=IMPLICIT_CAST typeOperand=Q of <root>.A
+            GET_VAR 'val b: <root>.A<kotlin.Int> [val] declared in <root>.bar' type=<root>.A<kotlin.Int> origin=null

compiler/testData/ir/irText/stubs/builtinMap.txt

@@ -16,13 +16,14 @@ FILE fqName:<root> fileName:/builtinMap.kt
               pair: GET_VAR 'pair: kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> declared in <root>.plus' type=kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> origin=null
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
-            then: CALL 'public final fun apply <T> (block: @[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<T of kotlin.apply, kotlin.Unit>): T of kotlin.apply [inline] declared in kotlin' type=java.util.LinkedHashMap<K1 of <root>.plus?, V1 of <root>.plus?> origin=null
+            then: CALL 'public final fun apply <T> (block: @[ExtensionFunctionType] kotlin.Function1<T of kotlin.apply, kotlin.Unit>): T of kotlin.apply [inline] declared in kotlin' type=java.util.LinkedHashMap<K1 of <root>.plus?, V1 of <root>.plus?> origin=null
               <T>: java.util.LinkedHashMap<K1 of <root>.plus?, V1 of <root>.plus?>
               $receiver: CONSTRUCTOR_CALL 'public constructor <init> (p0: kotlin.collections.Map<out K of java.util.LinkedHashMap?, V of java.util.LinkedHashMap?>?) declared in java.util.LinkedHashMap' type=java.util.LinkedHashMap<K1 of <root>.plus?, V1 of <root>.plus?> origin=null
                 <class: K>: K1 of <root>.plus?
                 <class: V>: V1 of <root>.plus?
-                p0: GET_VAR '<this>: kotlin.collections.Map<out K1 of <root>.plus, V1 of <root>.plus> declared in <root>.plus' type=kotlin.collections.Map<out K1 of <root>.plus, V1 of <root>.plus> origin=null
-              block: BLOCK type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<java.util.LinkedHashMap<K1 of <root>.plus?, V1 of <root>.plus?>, kotlin.Unit> origin=LAMBDA
+                p0: TYPE_OP type=kotlin.collections.Map<out K of java.util.LinkedHashMap?, V of java.util.LinkedHashMap?> origin=IMPLICIT_CAST typeOperand=kotlin.collections.Map<out K of java.util.LinkedHashMap?, V of java.util.LinkedHashMap?>
+                  GET_VAR '<this>: kotlin.collections.Map<out K1 of <root>.plus, V1 of <root>.plus> declared in <root>.plus' type=kotlin.collections.Map<out K1 of <root>.plus, V1 of <root>.plus> origin=null
+              block: BLOCK type=@[ExtensionFunctionType] kotlin.Function1<java.util.LinkedHashMap<K1 of <root>.plus?, V1 of <root>.plus?>, kotlin.Unit> origin=LAMBDA
                 FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:java.util.LinkedHashMap<K1 of <root>.plus?, V1 of <root>.plus?>) returnType:kotlin.Unit 
                   $receiver: VALUE_PARAMETER name:<this> type:java.util.LinkedHashMap<K1 of <root>.plus?, V1 of <root>.plus?> 
                   BLOCK_BODY
@@ -34,4 +35,4 @@ FILE fqName:<root> fileName:/builtinMap.kt
                             $this: GET_VAR 'pair: kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> declared in <root>.plus' type=kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> origin=null
                           value: CALL 'public final fun <get-second> (): B of kotlin.Pair declared in kotlin.Pair' type=V1 of <root>.plus origin=GET_PROPERTY
                             $this: GET_VAR 'pair: kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> declared in <root>.plus' type=kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> origin=null
-                FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Unit declared in <root>.plus' type=@[CALL 'public constructor <init> () [primary] declared in kotlin.ExtensionFunctionType' type=kotlin.ExtensionFunctionType origin=null] kotlin.Function1<java.util.LinkedHashMap<K1 of <root>.plus?, V1 of <root>.plus?>, kotlin.Unit> origin=LAMBDA
+                FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Unit declared in <root>.plus' type=@[ExtensionFunctionType] kotlin.Function1<java.util.LinkedHashMap<K1 of <root>.plus?, V1 of <root>.plus?>, kotlin.Unit> origin=LAMBDA

compiler/testData/ir/irText/stubs/constFromBuiltins__kotlin.Int.txt

@@ -79,62 +79,32 @@ CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Int modality:FINAL visibility:publ
     VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:<unbound IrClassSymbolImpl> 
   FUN IR_EXTERNAL_DECLARATION_STUB name:mod visibility:public modality:FINAL <> ($this:kotlin.Int, other:<unbound IrClassSymbolImpl>) returnType:kotlin.Int 
     annotations:
-      CALL 'UNBOUND IrConstructorSymbolImpl' type=<unbound IrClassSymbolImpl> origin=null
-        1: CONST String type=<unbound IrClassSymbolImpl> value="Use rem(other) instead"
-        2: CALL 'UNBOUND IrConstructorSymbolImpl' type=<unbound IrClassSymbolImpl> origin=null
-          1: CONST String type=<unbound IrClassSymbolImpl> value="rem(other)"
-          2: VARARG type=<unbound IrClassSymbolImpl><out <unbound IrClassSymbolImpl>> varargElementType=<unbound IrClassSymbolImpl>
-        3: GET_ENUM 'UNBOUND IrEnumEntrySymbolImpl' type=<unbound IrClassSymbolImpl>
+      <unbound>(1 = 'Use rem(other) instead', 2 = <unbound>(1 = 'rem(other)', 2 = []), 3 = GET_ENUM 'UNBOUND IrEnumEntrySymbolImpl' type=<unbound IrClassSymbolImpl>)
     $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Int
     VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:<unbound IrClassSymbolImpl> 
   FUN IR_EXTERNAL_DECLARATION_STUB name:mod visibility:public modality:FINAL <> ($this:kotlin.Int, other:<unbound IrClassSymbolImpl>) returnType:<unbound IrClassSymbolImpl> 
     annotations:
-      CALL 'UNBOUND IrConstructorSymbolImpl' type=<unbound IrClassSymbolImpl> origin=null
-        1: CONST String type=<unbound IrClassSymbolImpl> value="Use rem(other) instead"
-        2: CALL 'UNBOUND IrConstructorSymbolImpl' type=<unbound IrClassSymbolImpl> origin=null
-          1: CONST String type=<unbound IrClassSymbolImpl> value="rem(other)"
-          2: VARARG type=<unbound IrClassSymbolImpl><out <unbound IrClassSymbolImpl>> varargElementType=<unbound IrClassSymbolImpl>
-        3: GET_ENUM 'UNBOUND IrEnumEntrySymbolImpl' type=<unbound IrClassSymbolImpl>
+      <unbound>(1 = 'Use rem(other) instead', 2 = <unbound>(1 = 'rem(other)', 2 = []), 3 = GET_ENUM 'UNBOUND IrEnumEntrySymbolImpl' type=<unbound IrClassSymbolImpl>)
     $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Int
     VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:<unbound IrClassSymbolImpl> 
   FUN IR_EXTERNAL_DECLARATION_STUB name:mod visibility:public modality:FINAL <> ($this:kotlin.Int, other:<unbound IrClassSymbolImpl>) returnType:<unbound IrClassSymbolImpl> 
     annotations:
-      CALL 'UNBOUND IrConstructorSymbolImpl' type=<unbound IrClassSymbolImpl> origin=null
-        1: CONST String type=<unbound IrClassSymbolImpl> value="Use rem(other) instead"
-        2: CALL 'UNBOUND IrConstructorSymbolImpl' type=<unbound IrClassSymbolImpl> origin=null
-          1: CONST String type=<unbound IrClassSymbolImpl> value="rem(other)"
-          2: VARARG type=<unbound IrClassSymbolImpl><out <unbound IrClassSymbolImpl>> varargElementType=<unbound IrClassSymbolImpl>
-        3: GET_ENUM 'UNBOUND IrEnumEntrySymbolImpl' type=<unbound IrClassSymbolImpl>
+      <unbound>(1 = 'Use rem(other) instead', 2 = <unbound>(1 = 'rem(other)', 2 = []), 3 = GET_ENUM 'UNBOUND IrEnumEntrySymbolImpl' type=<unbound IrClassSymbolImpl>)
     $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Int
     VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:<unbound IrClassSymbolImpl> 
   FUN IR_EXTERNAL_DECLARATION_STUB name:mod visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Int) returnType:kotlin.Int 
     annotations:
-      CALL 'UNBOUND IrConstructorSymbolImpl' type=<unbound IrClassSymbolImpl> origin=null
-        1: CONST String type=<unbound IrClassSymbolImpl> value="Use rem(other) instead"
-        2: CALL 'UNBOUND IrConstructorSymbolImpl' type=<unbound IrClassSymbolImpl> origin=null
-          1: CONST String type=<unbound IrClassSymbolImpl> value="rem(other)"
-          2: VARARG type=<unbound IrClassSymbolImpl><out <unbound IrClassSymbolImpl>> varargElementType=<unbound IrClassSymbolImpl>
-        3: GET_ENUM 'UNBOUND IrEnumEntrySymbolImpl' type=<unbound IrClassSymbolImpl>
+      <unbound>(1 = 'Use rem(other) instead', 2 = <unbound>(1 = 'rem(other)', 2 = []), 3 = GET_ENUM 'UNBOUND IrEnumEntrySymbolImpl' type=<unbound IrClassSymbolImpl>)
     $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Int
     VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Int 
   FUN IR_EXTERNAL_DECLARATION_STUB name:mod visibility:public modality:FINAL <> ($this:kotlin.Int, other:<unbound IrClassSymbolImpl>) returnType:<unbound IrClassSymbolImpl> 
     annotations:
-      CALL 'UNBOUND IrConstructorSymbolImpl' type=<unbound IrClassSymbolImpl> origin=null
-        1: CONST String type=<unbound IrClassSymbolImpl> value="Use rem(other) instead"
-        2: CALL 'UNBOUND IrConstructorSymbolImpl' type=<unbound IrClassSymbolImpl> origin=null
-          1: CONST String type=<unbound IrClassSymbolImpl> value="rem(other)"
-          2: VARARG type=<unbound IrClassSymbolImpl><out <unbound IrClassSymbolImpl>> varargElementType=<unbound IrClassSymbolImpl>
-        3: GET_ENUM 'UNBOUND IrEnumEntrySymbolImpl' type=<unbound IrClassSymbolImpl>
+      <unbound>(1 = 'Use rem(other) instead', 2 = <unbound>(1 = 'rem(other)', 2 = []), 3 = GET_ENUM 'UNBOUND IrEnumEntrySymbolImpl' type=<unbound IrClassSymbolImpl>)
     $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Int
     VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:<unbound IrClassSymbolImpl> 
   FUN IR_EXTERNAL_DECLARATION_STUB name:mod visibility:public modality:FINAL <> ($this:kotlin.Int, other:<unbound IrClassSymbolImpl>) returnType:kotlin.Int 
     annotations:
-      CALL 'UNBOUND IrConstructorSymbolImpl' type=<unbound IrClassSymbolImpl> origin=null
-        1: CONST String type=<unbound IrClassSymbolImpl> value="Use rem(other) instead"
-        2: CALL 'UNBOUND IrConstructorSymbolImpl' type=<unbound IrClassSymbolImpl> origin=null
-          1: CONST String type=<unbound IrClassSymbolImpl> value="rem(other)"
-          2: VARARG type=<unbound IrClassSymbolImpl><out <unbound IrClassSymbolImpl>> varargElementType=<unbound IrClassSymbolImpl>
-        3: GET_ENUM 'UNBOUND IrEnumEntrySymbolImpl' type=<unbound IrClassSymbolImpl>
+      <unbound>(1 = 'Use rem(other) instead', 2 = <unbound>(1 = 'rem(other)', 2 = []), 3 = GET_ENUM 'UNBOUND IrEnumEntrySymbolImpl' type=<unbound IrClassSymbolImpl>)
     $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Int
     VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:<unbound IrClassSymbolImpl> 
   FUN IR_EXTERNAL_DECLARATION_STUB name:or visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Int) returnType:kotlin.Int 
@@ -172,38 +142,32 @@ CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Int modality:FINAL visibility:publ
     VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:<unbound IrClassSymbolImpl> 
   FUN IR_EXTERNAL_DECLARATION_STUB name:rem visibility:public modality:FINAL <> ($this:kotlin.Int, other:<unbound IrClassSymbolImpl>) returnType:kotlin.Int 
     annotations:
-      CALL 'UNBOUND IrConstructorSymbolImpl' type=<unbound IrClassSymbolImpl> origin=null
-        1: CONST String type=<unbound IrClassSymbolImpl> value="1.1"
+      <unbound>(1 = '1.1')
     $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Int
     VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:<unbound IrClassSymbolImpl> 
   FUN IR_EXTERNAL_DECLARATION_STUB name:rem visibility:public modality:FINAL <> ($this:kotlin.Int, other:<unbound IrClassSymbolImpl>) returnType:<unbound IrClassSymbolImpl> 
     annotations:
-      CALL 'UNBOUND IrConstructorSymbolImpl' type=<unbound IrClassSymbolImpl> origin=null
-        1: CONST String type=<unbound IrClassSymbolImpl> value="1.1"
+      <unbound>(1 = '1.1')
     $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Int
     VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:<unbound IrClassSymbolImpl> 
   FUN IR_EXTERNAL_DECLARATION_STUB name:rem visibility:public modality:FINAL <> ($this:kotlin.Int, other:<unbound IrClassSymbolImpl>) returnType:<unbound IrClassSymbolImpl> 
     annotations:
-      CALL 'UNBOUND IrConstructorSymbolImpl' type=<unbound IrClassSymbolImpl> origin=null
-        1: CONST String type=<unbound IrClassSymbolImpl> value="1.1"
+      <unbound>(1 = '1.1')
     $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Int
     VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:<unbound IrClassSymbolImpl> 
   FUN IR_EXTERNAL_DECLARATION_STUB name:rem visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Int) returnType:kotlin.Int 
     annotations:
-      CALL 'UNBOUND IrConstructorSymbolImpl' type=<unbound IrClassSymbolImpl> origin=null
-        1: CONST String type=<unbound IrClassSymbolImpl> value="1.1"
+      <unbound>(1 = '1.1')
     $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Int
     VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Int 
   FUN IR_EXTERNAL_DECLARATION_STUB name:rem visibility:public modality:FINAL <> ($this:kotlin.Int, other:<unbound IrClassSymbolImpl>) returnType:<unbound IrClassSymbolImpl> 
     annotations:
-      CALL 'UNBOUND IrConstructorSymbolImpl' type=<unbound IrClassSymbolImpl> origin=null
-        1: CONST String type=<unbound IrClassSymbolImpl> value="1.1"
+      <unbound>(1 = '1.1')
     $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Int
     VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:<unbound IrClassSymbolImpl> 
   FUN IR_EXTERNAL_DECLARATION_STUB name:rem visibility:public modality:FINAL <> ($this:kotlin.Int, other:<unbound IrClassSymbolImpl>) returnType:kotlin.Int 
     annotations:
-      CALL 'UNBOUND IrConstructorSymbolImpl' type=<unbound IrClassSymbolImpl> origin=null
-        1: CONST String type=<unbound IrClassSymbolImpl> value="1.1"
+      <unbound>(1 = '1.1')
     $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Int
     VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:<unbound IrClassSymbolImpl> 
   FUN IR_EXTERNAL_DECLARATION_STUB name:shl visibility:public modality:FINAL <> ($this:kotlin.Int, bitCount:kotlin.Int) returnType:kotlin.Int 
@@ -292,8 +256,7 @@ CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Int modality:FINAL visibility:publ
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Int.Companion 
     PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SIZE_BITS visibility:public modality:FINAL [const,val] 
       annotations:
-        CALL 'UNBOUND IrConstructorSymbolImpl' type=<unbound IrClassSymbolImpl> origin=null
-          1: CONST String type=<unbound IrClassSymbolImpl> value="1.3"
+        <unbound>(1 = '1.3')
       FIELD IR_EXTERNAL_DECLARATION_STUB name:SIZE_BITS type:kotlin.Int visibility:public [final]
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=32
@@ -302,8 +265,7 @@ CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Int modality:FINAL visibility:publ
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Int.Companion 
     PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SIZE_BYTES visibility:public modality:FINAL [const,val] 
       annotations:
-        CALL 'UNBOUND IrConstructorSymbolImpl' type=<unbound IrClassSymbolImpl> origin=null
-          1: CONST String type=<unbound IrClassSymbolImpl> value="1.3"
+        <unbound>(1 = '1.3')
       FIELD IR_EXTERNAL_DECLARATION_STUB name:SIZE_BYTES type:kotlin.Int visibility:public [final]
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=4

compiler/testData/ir/irText/types/localVariableOfIntersectionType.txt

@@ -1,98 +1,98 @@
 FILE fqName:<root> fileName:/localVariableOfIntersectionType.kt
   CLASS INTERFACE name:In modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.In<T of <root>.In>
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.In<T of <root>.In> 
     TYPE_PARAMETER name:T index:0 variance:in superTypes:[kotlin.Any?]
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   CLASS INTERFACE name:Inv modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Inv<T of <root>.Inv>
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Inv<T of <root>.Inv> 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
-    PROPERTY name:t visibility:public modality:ABSTRACT [val]
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-t> visibility:public modality:ABSTRACT <> ($this:<root>.Inv<T of <root>.Inv>) returnType:T of <root>.Inv
-        correspondingProperty: PROPERTY name:t visibility:public modality:ABSTRACT [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Inv<T of <root>.Inv>
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
+    PROPERTY name:t visibility:public modality:ABSTRACT [val] 
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-t> visibility:public modality:ABSTRACT <> ($this:<root>.Inv<T of <root>.Inv>) returnType:T of <root>.Inv 
+        correspondingProperty: PROPERTY name:t visibility:public modality:ABSTRACT [val] 
+        $this: VALUE_PARAMETER name:<this> type:<root>.Inv<T of <root>.Inv> 
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   CLASS INTERFACE name:Z modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Z
-    FUN name:create visibility:public modality:ABSTRACT <T> ($this:<root>.Z, x:<root>.In<T of <root>.Z.create>, y:<root>.In<T of <root>.Z.create>) returnType:<root>.Inv<T of <root>.Z.create>
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Z 
+    FUN name:create visibility:public modality:ABSTRACT <T> ($this:<root>.Z, x:<root>.In<T of <root>.Z.create>, y:<root>.In<T of <root>.Z.create>) returnType:<root>.Inv<T of <root>.Z.create> 
       TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
-      $this: VALUE_PARAMETER name:<this> type:<root>.Z
-      VALUE_PARAMETER name:x index:0 type:<root>.In<T of <root>.Z.create>
-      VALUE_PARAMETER name:y index:1 type:<root>.In<T of <root>.Z.create>
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
+      $this: VALUE_PARAMETER name:<this> type:<root>.Z 
+      VALUE_PARAMETER name:x index:0 type:<root>.In<T of <root>.Z.create> 
+      VALUE_PARAMETER name:y index:1 type:<root>.In<T of <root>.Z.create> 
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   CLASS INTERFACE name:IA modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IA
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.IA) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.IA
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IA 
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.IA) returnType:kotlin.Unit 
+      $this: VALUE_PARAMETER name:<this> type:<root>.IA 
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   CLASS INTERFACE name:IB modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IB
-    FUN name:bar visibility:public modality:ABSTRACT <> ($this:<root>.IB) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.IB
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IB 
+    FUN name:bar visibility:public modality:ABSTRACT <> ($this:<root>.IB) returnType:kotlin.Unit 
+      $this: VALUE_PARAMETER name:<this> type:<root>.IB 
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  FUN name:test visibility:public modality:FINAL <> (a:<root>.In<<root>.IA>, b:<root>.In<<root>.IB>, z:<root>.Z) returnType:kotlin.Unit
-    VALUE_PARAMETER name:a index:0 type:<root>.In<<root>.IA>
-    VALUE_PARAMETER name:b index:1 type:<root>.In<<root>.IB>
-    VALUE_PARAMETER name:z index:2 type:<root>.Z
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+  FUN name:test visibility:public modality:FINAL <> (a:<root>.In<<root>.IA>, b:<root>.In<<root>.IB>, z:<root>.Z) returnType:kotlin.Unit 
+    VALUE_PARAMETER name:a index:0 type:<root>.In<<root>.IA> 
+    VALUE_PARAMETER name:b index:1 type:<root>.In<<root>.IB> 
+    VALUE_PARAMETER name:z index:2 type:<root>.Z 
     BLOCK_BODY
       CALL 'public abstract fun foo (): kotlin.Unit declared in <root>.IA' type=kotlin.Unit origin=null
         $this: TYPE_OP type=<root>.IA origin=IMPLICIT_CAST typeOperand=<root>.IA
@@ -110,7 +110,7 @@ FILE fqName:<root> fileName:/localVariableOfIntersectionType.kt
               $this: GET_VAR 'z: <root>.Z declared in <root>.test' type=<root>.Z origin=null
               x: GET_VAR 'a: <root>.In<<root>.IA> declared in <root>.test' type=<root>.In<<root>.IA> origin=null
               y: GET_VAR 'b: <root>.In<<root>.IB> declared in <root>.test' type=<root>.In<<root>.IB> origin=null
-      VAR name:t type:kotlin.Any [val]
+      VAR name:t type:kotlin.Any [val] 
         TYPE_OP type=kotlin.Any origin=IMPLICIT_CAST typeOperand=kotlin.Any
           CALL 'public abstract fun <get-t> (): T of <root>.Inv declared in <root>.Inv' type=kotlin.Any origin=GET_PROPERTY
             $this: CALL 'public abstract fun create <T> (x: <root>.In<T of <root>.Z.create>, y: <root>.In<T of <root>.Z.create>): <root>.Inv<T of <root>.Z.create> declared in <root>.Z' type=<root>.Inv<kotlin.Any> origin=null