From e80a6a713bb7da879959403e834fec2b702ca750 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 14 Jul 2020 14:42:14 +0200 Subject: [PATCH] IR: use IrFactory in misc utils (cherry picked from commit c61a4f2d8f88542228ddc4b92ebbe6b3200e7dbd) --- .../backend/konan/BuiltInFictitiousFunctionIrClassFactory.kt | 2 +- .../backend/konan/ir/interop/DescriptorToIrTranslationUtils.kt | 2 +- .../kotlin/backend/konan/serialization/KonanIrlinker.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/BuiltInFictitiousFunctionIrClassFactory.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/BuiltInFictitiousFunctionIrClassFactory.kt index ab572d17a61..58a454f97d6 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/BuiltInFictitiousFunctionIrClassFactory.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/BuiltInFictitiousFunctionIrClassFactory.kt @@ -153,7 +153,7 @@ internal class BuiltInFictitiousFunctionIrClassFactory( } private fun createIrClass(symbol: IrClassSymbol, descriptor: ClassDescriptor): IrClass = - createIrClassFromDescriptor(offset, offset, DECLARATION_ORIGIN_FUNCTION_CLASS, symbol, descriptor) + IrFactoryImpl.createIrClassFromDescriptor(offset, offset, DECLARATION_ORIGIN_FUNCTION_CLASS, symbol, descriptor) private fun createClass(descriptor: FunctionClassDescriptor, declarator: SymbolTable.((IrClassSymbol) -> IrClass) -> IrClass): IrClass = symbolTable?.declarator { createIrClass(it, descriptor) } diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/DescriptorToIrTranslationUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/DescriptorToIrTranslationUtils.kt index 2233d5a7382..1227d867a4c 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/DescriptorToIrTranslationUtils.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/DescriptorToIrTranslationUtils.kt @@ -50,7 +50,7 @@ internal interface DescriptorToIrTranslationMixin { */ fun createClass(descriptor: ClassDescriptor, builder: (IrClass) -> Unit): IrClass = symbolTable.declareClass(descriptor) { - createIrClassFromDescriptor( + symbolTable.irFactory.createIrClassFromDescriptor( SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, IrDeclarationOrigin.IR_EXTERNAL_DECLARATION_STUB, it, descriptor ) }.also { irClass -> diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt index 7d7cb25c98f..ca6e85a7045 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt @@ -198,7 +198,7 @@ internal class KonanIrLinker( val irFile = getIrFile(packageDescriptor) val klass = symbolTable.declareClassFromLinker(descriptor, idSig) { symbol -> - createIrClassFromDescriptor(offset, offset, FORWARD_DECLARATION_ORIGIN, symbol, descriptor) + symbolTable.irFactory.createIrClassFromDescriptor(offset, offset, FORWARD_DECLARATION_ORIGIN, symbol, descriptor) } klass.parent = irFile