From db9e3c90856c04197a62300dbb89db036787d795 Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Wed, 14 Oct 2020 13:17:12 +0300 Subject: [PATCH] IrDelegatingConstructorCall.fromSymbolDescriptor (cherry picked from commit 7c8a598c36165a9f6f15e5dcd87acd44008c1400) --- .../backend/konan/ir/interop/cenum/CEnumCompanionGenerator.kt | 2 +- .../backend/konan/ir/interop/cenum/CEnumVarClassGenerator.kt | 4 ++-- .../konan/ir/interop/cstruct/CStructVarClassGenerator.kt | 2 +- .../konan/ir/interop/cstruct/CStructVarCompanionGenerator.kt | 2 +- .../kotlin/backend/konan/lower/EnumConstructorsLowering.kt | 4 ++-- .../jetbrains/kotlin/backend/konan/lower/InteropLowering.kt | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumCompanionGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumCompanionGenerator.kt index cd848569a00..eafb782eda2 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumCompanionGenerator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumCompanionGenerator.kt @@ -52,7 +52,7 @@ internal class CEnumCompanionGenerator( val superConstructorSymbol = symbolTable.referenceConstructor(anyPrimaryConstructor) return createConstructor(companionObjectDescriptor.unsubstitutedPrimaryConstructor!!).also { it.body = irBuilder(irBuiltIns, it.symbol, SYNTHETIC_OFFSET, SYNTHETIC_OFFSET).irBlockBody { - +IrDelegatingConstructorCallImpl( + +IrDelegatingConstructorCallImpl.fromSymbolDescriptor( startOffset, endOffset, context.irBuiltIns.unitType, superConstructorSymbol, superConstructorSymbol.owner.typeParameters.size, diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumVarClassGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumVarClassGenerator.kt index cd0388b7574..aa0a04c6abf 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumVarClassGenerator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumVarClassGenerator.kt @@ -81,7 +81,7 @@ internal class CEnumVarClassGenerator( val superConstructorSymbol = symbolTable.referenceConstructor(interopBuiltIns.cPrimitiveVarType.unsubstitutedPrimaryConstructor!!) return createConstructor(companionObjectDescriptor.unsubstitutedPrimaryConstructor!!).also { it.body = irBuilder(irBuiltIns, it.symbol, SYNTHETIC_OFFSET, SYNTHETIC_OFFSET).irBlockBody { - +IrDelegatingConstructorCallImpl( + +IrDelegatingConstructorCallImpl.fromSymbolDescriptor( startOffset, endOffset, context.irBuiltIns.unitType, superConstructorSymbol, superConstructorSymbol.owner.typeParameters.size, @@ -93,4 +93,4 @@ internal class CEnumVarClassGenerator( } } } -} \ No newline at end of file +} diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cstruct/CStructVarClassGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cstruct/CStructVarClassGenerator.kt index f76c7f45974..8ab3200b262 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cstruct/CStructVarClassGenerator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cstruct/CStructVarClassGenerator.kt @@ -62,7 +62,7 @@ internal class CStructVarClassGenerator( ) return createConstructor(irClass.descriptor.unsubstitutedPrimaryConstructor!!).also { irConstructor -> irConstructor.body = irBuilder(irBuiltIns, irConstructor.symbol, SYNTHETIC_OFFSET, SYNTHETIC_OFFSET).irBlockBody { - +IrDelegatingConstructorCallImpl( + +IrDelegatingConstructorCallImpl.fromSymbolDescriptor( startOffset, endOffset, context.irBuiltIns.unitType, enumVarConstructorSymbol, irConstructor.typeParameters.size, diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cstruct/CStructVarCompanionGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cstruct/CStructVarCompanionGenerator.kt index 604b3b5a21f..2277c7b704d 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cstruct/CStructVarCompanionGenerator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cstruct/CStructVarCompanionGenerator.kt @@ -46,7 +46,7 @@ internal class CStructVarCompanionGenerator( val superConstructorSymbol = symbolTable.referenceConstructor(interopBuiltIns.cStructVarType.unsubstitutedPrimaryConstructor!!) return createConstructor(companionObjectDescriptor.unsubstitutedPrimaryConstructor!!).also { irConstructor -> irConstructor.body = irBuilder(irBuiltIns, irConstructor.symbol, SYNTHETIC_OFFSET, SYNTHETIC_OFFSET).irBlockBody { - +IrDelegatingConstructorCallImpl( + +IrDelegatingConstructorCallImpl.fromSymbolDescriptor( startOffset, endOffset, context.irBuiltIns.unitType, superConstructorSymbol, irConstructor.typeParameters.size, diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumConstructorsLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumConstructorsLowering.kt index d97ddc5ed98..cf85928b404 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumConstructorsLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumConstructorsLowering.kt @@ -176,7 +176,7 @@ internal class EnumConstructorsLowering(val context: Context) : ClassLoweringPas val endOffset = enumConstructorCall.endOffset val origin = enumConstructorCall.origin - val result = IrDelegatingConstructorCallImpl( + val result = IrDelegatingConstructorCallImpl.fromSymbolDescriptor( startOffset, endOffset, context.irBuiltIns.unitType, enumConstructorCall.symbol, @@ -213,7 +213,7 @@ internal class EnumConstructorsLowering(val context: Context) : ClassLoweringPas throw AssertionError("Constructor called in enum entry initializer should've been lowered: $delegatingConstructor") } - val result = IrDelegatingConstructorCallImpl( + val result = IrDelegatingConstructorCallImpl.fromSymbolDescriptor( startOffset, endOffset, context.irBuiltIns.unitType, loweredDelegatingConstructor.symbol, diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt index ecd4d0b2d33..32a4e21e563 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt @@ -496,7 +496,7 @@ private class InteropLoweringPart1(val context: Context) : BaseInteropIrTransfor return builder.irBlock(expression) { // Required for the IR to be valid, will be ignored in codegen: - +IrDelegatingConstructorCallImpl( + +IrDelegatingConstructorCallImpl.fromSymbolDescriptor( startOffset, endOffset, context.irBuiltIns.unitType,