From 392d248c236565eda39a1294061b44a2a79f37a3 Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Wed, 22 Jan 2020 20:56:30 +0300 Subject: [PATCH] [IR] Fixed IrClass.isFun parameter (cherry picked from commit 1196abf01da98b4e119546d7afac80611481f0ff) --- .../kotlin/backend/konan/EnumSpecialDescriptorsFactory.kt | 3 ++- .../src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt | 3 ++- .../kotlin/backend/konan/lower/CallableReferenceLowering.kt | 3 ++- .../org/jetbrains/kotlin/backend/konan/lower/TestProcessor.kt | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EnumSpecialDescriptorsFactory.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EnumSpecialDescriptorsFactory.kt index ad1d2d6d189..5d8f270d1a8 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EnumSpecialDescriptorsFactory.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EnumSpecialDescriptorsFactory.kt @@ -57,7 +57,8 @@ internal class EnumSpecialDeclarationsFactory(val context: Context) { isData = false, isExternal = false, isInline = false, - isExpect = false + isExpect = false, + isFun = false ).apply { it.bind(this) parent = enumClass diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt index b3705091cdb..a32abf3a8d2 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt @@ -1204,7 +1204,8 @@ private class ObjCBlockPointerValuePassing( OBJC_BLOCK_FUNCTION_IMPL, IrClassSymbolImpl(classDescriptor), Name.identifier(stubs.getUniqueKotlinFunctionReferenceClassName("BlockFunctionImpl")), ClassKind.CLASS, Visibilities.PRIVATE, Modality.FINAL, - isCompanion = false, isInner = false, isData = false, isExternal = false, isInline = false, isExpect = false + isCompanion = false, isInner = false, isData = false, isExternal = false, + isInline = false, isExpect = false, isFun = false ) classDescriptor.bind(irClass) irClass.createParameterDeclarations() diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt index 82d8b4fb27c..7dd3eb70ae3 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt @@ -165,7 +165,8 @@ internal class CallableReferenceLowering(val context: Context): FileLoweringPass isData = false, isExternal = false, isInline = false, - isExpect = false + isExpect = false, + isFun = false ).apply { it.bind(this) parent = this@FunctionReferenceBuilder.parent diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TestProcessor.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TestProcessor.kt index 9fee680b00e..8c918cda1b6 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TestProcessor.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TestProcessor.kt @@ -491,7 +491,8 @@ internal class TestProcessor (val context: Context) { isData = false, isExternal = false, isInline = false, - isExpect = false + isExpect = false, + isFun = false ).apply { descriptor.bind(this) createParameterDeclarations()