azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IR: use IrFactory in misc utils

Browse Source 
(cherry picked from commit c61a4f2d8f88542228ddc4b92ebbe6b3200e7dbd)
This commit is contained in:
Alexander Udalov
2020-07-14 14:42:14 +02:00
committed by Vasily Levchenko
parent 725b29f9e8
commit e80a6a713b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/BuiltInFictitiousFunctionIrClassFactory.kt
+1 -1
View File
@@ -153,7 +153,7 @@ internal class BuiltInFictitiousFunctionIrClassFactory(
} }
private fun createIrClass(symbol: IrClassSymbol, descriptor: ClassDescriptor): IrClass = 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 = private fun createClass(descriptor: FunctionClassDescriptor, declarator: SymbolTable.((IrClassSymbol) -> IrClass) -> IrClass): IrClass =
symbolTable?.declarator { createIrClass(it, descriptor) } symbolTable?.declarator { createIrClass(it, descriptor) }
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/DescriptorToIrTranslationUtils.kt
+1 -1
View File
@@ -50,7 +50,7 @@ internal interface DescriptorToIrTranslationMixin {
*/ */
fun createClass(descriptor: ClassDescriptor, builder: (IrClass) -> Unit): IrClass = fun createClass(descriptor: ClassDescriptor, builder: (IrClass) -> Unit): IrClass =
symbolTable.declareClass(descriptor) { symbolTable.declareClass(descriptor) {
createIrClassFromDescriptor( symbolTable.irFactory.createIrClassFromDescriptor(
SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, IrDeclarationOrigin.IR_EXTERNAL_DECLARATION_STUB, it, descriptor SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, IrDeclarationOrigin.IR_EXTERNAL_DECLARATION_STUB, it, descriptor
) )
}.also { irClass -> }.also { irClass ->
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt
+1 -1
View File
@@ -198,7 +198,7 @@ internal class KonanIrLinker(
val irFile = getIrFile(packageDescriptor) val irFile = getIrFile(packageDescriptor)
val klass = symbolTable.declareClassFromLinker(descriptor, idSig) { symbol -> 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 klass.parent = irFile