From 28c0dac36f6845e6b2d80d7f079e5706ccbcad16 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 8 May 2020 14:31:30 +0300 Subject: [PATCH] [FIR] Set FirJavaClass.isInner properly --- .../org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt | 3 ++- compiler/testData/codegen/box/collections/charSequence.kt | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt index 8128064d248..3c12968b636 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt @@ -143,8 +143,9 @@ internal class FirJavaClassBuilder : AbstractFirRegularClassBuilder, FirAnnotati @OptIn(FirImplementationDetail::class) override fun build(): FirJavaClass { + val isInner = !isTopLevel && !isStatic val status = FirDeclarationStatusImpl(visibility, modality).apply { - isInner = !isTopLevel && !isStatic + this.isInner = isInner isCompanion = false isData = false isInline = false diff --git a/compiler/testData/codegen/box/collections/charSequence.kt b/compiler/testData/codegen/box/collections/charSequence.kt index b37860ebcfc..2e7a8611009 100644 --- a/compiler/testData/codegen/box/collections/charSequence.kt +++ b/compiler/testData/codegen/box/collections/charSequence.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // FILE: J.java