From 3d60fdfed1868b5aa6ac3730fa254a544dd641d0 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 30 Apr 2020 13:00:59 +0300 Subject: [PATCH] Raw FIR: don't check class kind for data / inline modifiers --- .../kotlin/fir/lightTree/converter/DeclarationsConverter.kt | 4 ++-- .../src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt index a39f071a6bc..1f96ac4d8e3 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt @@ -378,8 +378,8 @@ class DeclarationsConverter( isActual = modifiers.hasActual() isInner = modifiers.isInner() isCompanion = modifiers.isCompanion() && classKind == ClassKind.OBJECT - isData = modifiers.isDataClass() && classKind != ClassKind.OBJECT - isInline = modifiers.isInlineClass() && classKind != ClassKind.OBJECT + isData = modifiers.isDataClass() + isInline = modifiers.isInlineClass() } val classBuilder = if (status.modality == Modality.SEALED) { diff --git a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt index d83d21a16c8..19a9a83c90c 100644 --- a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt +++ b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt @@ -659,8 +659,8 @@ class RawFirBuilder( isActual = classOrObject.hasActualModifier() isInner = classOrObject.hasModifier(INNER_KEYWORD) isCompanion = (classOrObject as? KtObjectDeclaration)?.isCompanion() == true - isData = (classOrObject as? KtClass)?.isData() == true - isInline = (classOrObject as? KtClass)?.hasModifier(INLINE_KEYWORD) == true + isData = classOrObject.hasModifier(DATA_KEYWORD) + isInline = classOrObject.hasModifier(INLINE_KEYWORD) } withCapturedTypeParameters { if (!status.isInner) context.capturedTypeParameters = context.capturedTypeParameters.clear()