From fb6956f84201d5baf365fc9d36e594e7e4081134 Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Thu, 26 Mar 2020 19:33:53 +0300 Subject: [PATCH] IR common: use .isFakeOverride instead of checking origin --- .../kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt | 2 +- .../jetbrains/kotlin/backend/common/lower/LateinitLowering.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt index 2ea34ffc5b0..886b2fbd855 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt @@ -57,7 +57,7 @@ open class DefaultArgumentStubGenerator( val newIrFunction = irFunction.generateDefaultsFunction(context, skipInlineMethods, skipExternalMethods, forceSetOverrideSymbols, visibility) ?: return null - if (newIrFunction.origin == IrDeclarationOrigin.FAKE_OVERRIDE) { + if (newIrFunction.isFakeOverride) { return listOf(irFunction, newIrFunction) } diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LateinitLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LateinitLowering.kt index 2ba29d109c2..8becd7a0215 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LateinitLowering.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LateinitLowering.kt @@ -213,4 +213,4 @@ private fun CommonBackendContext.buildOrGetNullableField(originalField: IrField) } } -private val IrProperty.isRealLateinit get() = isLateinit && origin != IrDeclarationOrigin.FAKE_OVERRIDE \ No newline at end of file +private val IrProperty.isRealLateinit get() = isLateinit && getter?.isFakeOverride != true \ No newline at end of file