diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/CoroutineCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/CoroutineCodegen.kt index d4e8e91b957..94dc270f307 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/CoroutineCodegen.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/CoroutineCodegen.kt @@ -127,7 +127,7 @@ private fun IrFunction.suspendFunctionView(context: JvmBackendContext): IrFuncti return IrFunctionImpl( startOffset, endOffset, SUSPEND_FUNCTION_VIEW, IrSimpleFunctionSymbolImpl(descriptor), name, visibility, modality, context.irBuiltIns.anyNType, - isInline, isExternal, isTailrec, isSuspend + isInline = isInline, isExternal = isExternal, isTailrec = isTailrec, isSuspend = isSuspend, isExpect = isExpect ).also { descriptor.bind(it) it.parent = parent diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/JvmDeclarationFactory.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/JvmDeclarationFactory.kt index bd5f013a999..db150453184 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/JvmDeclarationFactory.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/JvmDeclarationFactory.kt @@ -81,10 +81,17 @@ class JvmDeclarationFactory( private fun createInnerClassConstructorWithOuterThisParameter(oldConstructor: IrConstructor): IrConstructor { val newDescriptor = WrappedClassConstructorDescriptor(oldConstructor.descriptor.annotations) return IrConstructorImpl( - oldConstructor.startOffset, oldConstructor.endOffset, oldConstructor.origin, + oldConstructor.startOffset, + oldConstructor.endOffset, + oldConstructor.origin, IrConstructorSymbolImpl(newDescriptor), - oldConstructor.name, oldConstructor.visibility, oldConstructor.returnType, - oldConstructor.isInline, oldConstructor.isExternal, oldConstructor.isPrimary + oldConstructor.name, + oldConstructor.visibility, + oldConstructor.returnType, + isInline = oldConstructor.isInline, + isExternal = oldConstructor.isExternal, + isPrimary = oldConstructor.isPrimary, + isExpect = oldConstructor.isExpect ).apply { newDescriptor.bind(this) annotations.addAll(oldConstructor.annotations.map { it.deepCopyWithSymbols(this) }) @@ -172,7 +179,8 @@ class JvmDeclarationFactory( isInner = false, isData = false, isExternal = false, - isInline = false + isInline = false, + isExpect = false ).apply { descriptor.bind(this) parent = interfaceClass diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt index 12d35af7168..6cb36b96186 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt @@ -205,7 +205,7 @@ private class BridgeLowering(val context: JvmBackendContext) : ClassLoweringPass IrSimpleFunctionSymbolImpl(newDescriptor), newName, visibility, modality, returnType, - isInline, isExternal, isTailrec, isSuspend + isInline = isInline, isExternal = isExternal, isTailrec = isTailrec, isSuspend = isSuspend, isExpect = isExpect ).apply { newDescriptor.bind(this) parent = this@copyRenamingTo.parent @@ -238,7 +238,8 @@ private class BridgeLowering(val context: JvmBackendContext) : ClassLoweringPass isInline = false, isExternal = false, isTailrec = false, - isSuspend = signatureFunction.isSuspend + isSuspend = signatureFunction.isSuspend, + isExpect = false ).apply { descriptor.bind(this) parent = irClass @@ -313,7 +314,7 @@ private class BridgeLowering(val context: JvmBackendContext) : ClassLoweringPass IrSimpleFunctionSymbolImpl(wrappedDescriptor), Name.identifier(getJvmName()), visibility, modality, returnType, - isInline, isExternal, isTailrec, isSuspend + isInline = isInline, isExternal = isExternal, isTailrec = isTailrec, isSuspend = isSuspend, isExpect = isExpect ).apply { wrappedDescriptor.bind(this) parent = this@orphanedCopy.parent diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/EnumClassLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/EnumClassLowering.kt index 72ea5f64c3b..cb29ab54c89 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/EnumClassLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/EnumClassLowering.kt @@ -113,7 +113,8 @@ private class EnumClassLowering(val context: JvmBackendContext) : ClassLoweringP returnType = enumConstructor.returnType, isInline = enumConstructor.isInline, isExternal = enumConstructor.isExternal, - isPrimary = enumConstructor.isPrimary + isPrimary = enumConstructor.isPrimary, + isExpect = enumConstructor.isExpect ).apply { val newConstructor = this descriptor.bind(this) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt index 2e72746eb11..b96f83fb913 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt @@ -86,7 +86,8 @@ private class FileClassLowering(val context: JvmBackendContext) : FileLoweringPa isInner = false, isData = false, isExternal = false, - isInline = false + isInline = false, + isExpect = false ).apply { descriptor.bind(this) superTypes.add(context.irBuiltIns.anyType) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InterfaceDelegationLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InterfaceDelegationLowering.kt index 6bfe8d07bca..d411732b884 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InterfaceDelegationLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InterfaceDelegationLowering.kt @@ -117,7 +117,8 @@ private class InterfaceDelegationLowering(val context: JvmBackendContext) : IrEl isInline = classOverride.isInline, isExternal = false, isTailrec = false, - isSuspend = classOverride.isSuspend + isSuspend = classOverride.isSuspend, + isExpect = false ).apply { descriptor.bind(this) parent = irClass @@ -130,7 +131,11 @@ private class InterfaceDelegationLowering(val context: JvmBackendContext) : IrEl IrPropertyImpl( UNDEFINED_OFFSET, UNDEFINED_OFFSET, IrDeclarationOrigin.DEFINED, IrPropertySymbolImpl(propertyDescriptor), inheritedProperty.name, Visibilities.PUBLIC, inheritedProperty.modality, inheritedProperty.isVar, - inheritedProperty.isConst, inheritedProperty.isLateinit, inheritedProperty.isDelegated, isExternal = false + isConst = inheritedProperty.isConst, + isLateinit = inheritedProperty.isLateinit, + isDelegated = inheritedProperty.isDelegated, + isExpect = inheritedProperty.isExpect, + isExternal = false ).apply { propertyDescriptor.bind(this) parent = irClass diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmOverloadsAnnotationLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmOverloadsAnnotationLowering.kt index db888c06514..d7a84fea24e 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmOverloadsAnnotationLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmOverloadsAnnotationLowering.kt @@ -129,7 +129,8 @@ private class JvmOverloadsAnnotationLowering(val context: JvmBackendContext) : C returnType = oldFunction.returnType, isInline = oldFunction.isInline, isExternal = false, - isPrimary = false + isPrimary = false, + isExpect = false ).apply { descriptor.bind(this) } @@ -147,7 +148,8 @@ private class JvmOverloadsAnnotationLowering(val context: JvmBackendContext) : C isInline = oldFunction.isInline, isExternal = false, isTailrec = false, - isSuspend = oldFunction.isSuspend + isSuspend = oldFunction.isSuspend, + isExpect = false ).apply { descriptor.bind(this) } diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmStaticAnnotationLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmStaticAnnotationLowering.kt index a20560070a5..2b1a2aa7a2e 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmStaticAnnotationLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmStaticAnnotationLowering.kt @@ -111,7 +111,8 @@ private class CompanionObjectJvmStaticLowering(val context: JvmBackendContext) : isInline = false, isExternal = false, isTailrec = false, - isSuspend = target.isSuspend + isSuspend = target.isSuspend, + isExpect = false ).apply { descriptor.bind(this) parent = irClass @@ -230,7 +231,8 @@ private class MakeCallsStatic( startOffset, endOffset, origin, IrSimpleFunctionSymbolImpl(newDescriptor), name, - visibility, modality, returnType, isInline, isExternal, isTailrec, isSuspend + visibility, modality, returnType, + isInline = isInline, isExternal = isExternal, isTailrec = isTailrec, isSuspend = isSuspend, isExpect = isExpect ).also { newDescriptor.bind(it) it.parent = parent diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ToArrayLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ToArrayLowering.kt index 2c719826d38..cd3ee41db4e 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ToArrayLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ToArrayLowering.kt @@ -83,7 +83,8 @@ private class ToArrayLowering(private val context: JvmBackendContext) : ClassLow isInline = false, isExternal = false, isTailrec = false, - isSuspend = false + isSuspend = false, + isExpect = false ) functionDescriptor.bind(irFunction) irFunction.parent = irClass @@ -152,7 +153,8 @@ private class ToArrayLowering(private val context: JvmBackendContext) : ClassLow isInline = false, isExternal = false, isTailrec = false, - isSuspend = false + isSuspend = false, + isExpect = false ) functionDescriptor.bind(irFunction) irFunction.parent = irClass