From 2c0c9e5b5cfec6c4f675ed59def6e89d253b26e3 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 26 Jun 2023 11:37:13 +0300 Subject: [PATCH] FIR2IR: drop error type check in createIrProperty --- .../jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt index 40b8d5aa9b6..a07f1c31091 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt @@ -985,8 +985,7 @@ class Fir2IrDeclarationStorage( property.name, property.isVal, initializer, typeToUse ).also { field -> if (initializer is FirConstExpression<*>) { - // TODO: Normally we shouldn't have error type here - val constType = initializer.typeRef.toIrType().takeIf { it !is IrErrorType } ?: typeToUse + val constType = initializer.typeRef.toIrType() field.initializer = factory.createExpressionBody(initializer.toIrConst(constType)) } }