From 302623c388db9be6fb976ba223f8a8143e741051 Mon Sep 17 00:00:00 2001 From: Artem Kobzar Date: Thu, 11 May 2023 12:32:21 +0000 Subject: [PATCH] [K/JS] Skip static members in fake overrides generating ^KT-58396 Fixed --- .../src/org/jetbrains/kotlin/ir/overrides/IrOverridingUtil.kt | 2 +- .../codegen/box/enum/enumEntriesCompatibilityCheck.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/overrides/IrOverridingUtil.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/overrides/IrOverridingUtil.kt index 887149a7c5c..9e16cca48c3 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/overrides/IrOverridingUtil.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/overrides/IrOverridingUtil.kt @@ -168,7 +168,7 @@ class IrOverridingUtil( allFromSuperByName.forEach { group -> generateOverridesInFunctionGroup( group.value, - fromCurrent.filter { it.name == group.key }, + fromCurrent.filter { it.name == group.key && !it.isStaticMember }, clazz, oldSignatures ) } diff --git a/compiler/testData/codegen/box/enum/enumEntriesCompatibilityCheck.kt b/compiler/testData/codegen/box/enum/enumEntriesCompatibilityCheck.kt index 2b061400e9c..22c3d8d7c63 100644 --- a/compiler/testData/codegen/box/enum/enumEntriesCompatibilityCheck.kt +++ b/compiler/testData/codegen/box/enum/enumEntriesCompatibilityCheck.kt @@ -1,6 +1,6 @@ // !LANGUAGE: +EnumEntries -// IGNORE_BACKEND: JS, JVM, JS_IR, JS_IR_ES6 -// IGNORE_BACKEND_K2: JVM_IR, NATIVE +// IGNORE_BACKEND: JS, JVM +// IGNORE_BACKEND_K2: JVM_IR, JS_IR, JS_IR_ES6, NATIVE // IGNORE_LIGHT_ANALYSIS // FULL_JDK // WITH_STDLIB