From d0a57384992d73743d9614a204435d4c3c29c2aa Mon Sep 17 00:00:00 2001 From: Ivan Kylchik Date: Tue, 15 Aug 2023 14:42:27 +0200 Subject: [PATCH] [Native] Drop `addChild` from `IrUtils2` We can reuse the same function from common `IrUtils` --- .../ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt | 5 ++++- .../src/org/jetbrains/kotlin/ir/util/IrUtils2.kt | 9 --------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt index c034c16aaa9..f484369cc52 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt @@ -1066,12 +1066,15 @@ fun IrType.remapTypeParameters( else -> this } -/* Copied from K/N */ fun IrDeclarationContainer.addChild(declaration: IrDeclaration) { this.declarations += declaration declaration.setDeclarationsParent(this) } +fun IrDeclarationContainer.addChildren(declarations: List) { + declarations.forEach { this.addChild(it) } +} + fun T.setDeclarationsParent(parent: IrDeclarationParent): T { accept(SetDeclarationsParentVisitor, parent) return this diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt index 15afe1424cb..3cc0fe84734 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt @@ -97,15 +97,6 @@ inline fun stub(name: String): T { } as T } -fun IrDeclarationContainer.addChildren(declarations: List) { - declarations.forEach { this.addChild(it) } -} - -fun IrDeclarationContainer.addChild(declaration: IrDeclaration) { - this.declarations += declaration - declaration.accept(SetDeclarationsParentVisitor, this) -} - tailrec fun IrDeclaration.getContainingFile(): IrFile? { val parent = this.parent