From a81b6731f820e93bba4fe598a7871d44809bc36b Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Fri, 9 Jun 2017 11:41:11 +0200
Subject: [PATCH] Move DumpIrTreeWithDescriptorsVisitor to common package

---
 .../backend/common/DeepCopyIrTreeWithDeclarations.kt     | 3 +--
 .../backend/common/DumpIrTreeWithDescriptorsVisitor.kt   | 4 ++--
 .../{konan/ir/KonanIrCopy.kt => common/IrCopy.kt}        | 9 ++++++---
 3 files changed, 9 insertions(+), 7 deletions(-)
 rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{konan/ir/KonanIrCopy.kt => common/IrCopy.kt} (85%)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/DeepCopyIrTreeWithDeclarations.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/DeepCopyIrTreeWithDeclarations.kt
index f2dda12fece..c7f69b754e4 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/DeepCopyIrTreeWithDeclarations.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/DeepCopyIrTreeWithDeclarations.kt
@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.backend.common
 
-import org.jetbrains.kotlin.backend.konan.ir.DeepCopyKonanIrTreeWithSymbols
 import org.jetbrains.kotlin.descriptors.VariableDescriptor
 import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor
 import org.jetbrains.kotlin.ir.IrElement
@@ -42,7 +41,7 @@ fun IrElement.deepCopyWithVariablesImpl(): IrElement {
     acceptVoid(symbolsRemapper)
 
     return this.transform(
-            object : DeepCopyKonanIrTreeWithSymbols(symbolsRemapper) {
+            object : DeepCopyIrTreeWithReturnableBlockSymbols(symbolsRemapper) {
                 override fun getNonTransformedLoop(irLoop: IrLoop): IrLoop {
                     return irLoop
                 }
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/DumpIrTreeWithDescriptorsVisitor.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/DumpIrTreeWithDescriptorsVisitor.kt
index 3d152390846..f77db618789 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/DumpIrTreeWithDescriptorsVisitor.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/DumpIrTreeWithDescriptorsVisitor.kt
@@ -1,6 +1,6 @@
 package org.jetbrains.kotlin.backend.common
 
-import org.jetbrains.kotlin.backend.konan.ir.IrReturnableBlockImpl
+import org.jetbrains.kotlin.backend.konan.ir.IrReturnableBlock
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor
 import org.jetbrains.kotlin.ir.IrElement
@@ -231,7 +231,7 @@ class DumpIrTreeWithDescriptorsVisitor(out: Appendable): IrElementVisitor<Unit,
     }
 
     override fun visitBlock(expression: IrBlock, data: String) {
-        if (expression is IrReturnableBlockImpl) {
+        if (expression is IrReturnableBlock) {
             printer.println("RETURNABLE BLOCK " + expression.descriptor)
             indented { super.visitBlock(expression, data) }
             return
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/KonanIrCopy.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/IrCopy.kt
similarity index 85%
rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/KonanIrCopy.kt
rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/IrCopy.kt
index a7fb479b74b..13907ed07f1 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/KonanIrCopy.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/IrCopy.kt
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.backend.konan.ir
+package org.jetbrains.kotlin.backend.common
 
+import org.jetbrains.kotlin.backend.konan.ir.IrReturnableBlock
+import org.jetbrains.kotlin.backend.konan.ir.IrReturnableBlockImpl
+import org.jetbrains.kotlin.backend.konan.ir.IrReturnableBlockSymbol
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.expressions.IrBlock
 import org.jetbrains.kotlin.ir.expressions.IrReturn
@@ -23,12 +26,12 @@ import org.jetbrains.kotlin.ir.expressions.impl.IrReturnImpl
 import org.jetbrains.kotlin.ir.util.DeepCopyIrTreeWithSymbols
 import org.jetbrains.kotlin.ir.util.SymbolRemapper
 
-internal open class DeepCopyKonanIrTreeWithSymbols(
+open class DeepCopyIrTreeWithReturnableBlockSymbols(
         private val symbolRemapper: SymbolRemapper
 ) : DeepCopyIrTreeWithSymbols(symbolRemapper) {
 
     private inline fun <reified T : IrElement> T.transform() =
-            transform(this@DeepCopyKonanIrTreeWithSymbols, null) as T
+            transform(this@DeepCopyIrTreeWithReturnableBlockSymbols, null) as T
 
     private val transformedReturnableBlocks = mutableMapOf<IrReturnableBlock, IrReturnableBlock>()