IR: annotations are represented as IrConstructorCall elements

Also, they are rendered somewhat nicer
2019-03-26 13:11:04 +03:00
parent db7bcb6464
commit e3fd74a580
66 changed files with 540 additions and 643 deletions
@@ -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()