From 55c37183d91da090236b6da0a45a3f9fdabd371d Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Sun, 31 Jan 2021 21:43:04 +0300 Subject: [PATCH] [Commonizer] Ignore constructors for enum entries --- .../descriptors/commonizer/mergedtree/CirTreeMerger.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt index 511c3871679..8188326fbb4 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt @@ -218,7 +218,11 @@ class CirTreeMerger( val functions: MutableMap = classNode.functions val nestedClasses: MutableMap = classNode.classes - classDescriptor.constructors.forEach { processClassConstructor(constructors, targetIndex, it, parentCommonDeclarationForMembers) } + if (classDescriptor.kind != ClassKind.ENUM_ENTRY) { + classDescriptor.constructors.forEach { constructorDescriptor -> + processClassConstructor(constructors, targetIndex, constructorDescriptor, parentCommonDeclarationForMembers) + } + } classDescriptor.unsubstitutedMemberScope.collectMembers( PropertyCollector { propertyDescriptor ->