From 5bba5b2fb7df5811778106ffdb250453010986d4 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Thu, 1 Jun 2017 17:16:05 +0200 Subject: [PATCH] Bind annotation methods via primary constructor --- .../jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt index d2bb7d4f6f8..28bdc7b5638 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt @@ -215,13 +215,13 @@ class ClassGenerator(declarationGenerator: DeclarationGenerator) : DeclarationGe private fun generatePrimaryConstructor(irClass: IrClass, ktClassOrObject: KtClassOrObject): IrConstructor? { val classDescriptor = irClass.descriptor - if (DescriptorUtils.isAnnotationClass(classDescriptor)) return null - val primaryConstructorDescriptor = classDescriptor.unsubstitutedPrimaryConstructor ?: return null val irPrimaryConstructor = FunctionGenerator(declarationGenerator).generatePrimaryConstructor(primaryConstructorDescriptor, ktClassOrObject) - irClass.addMember(irPrimaryConstructor) + if (!DescriptorUtils.isAnnotationClass(classDescriptor)) { + irClass.addMember(irPrimaryConstructor) + } return irPrimaryConstructor }