From d33e8c78d1c4d21f81cd1b6928f1b9dddf4e4286 Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Mon, 31 Jul 2017 15:48:51 +0200
Subject: [PATCH] Move StringConcatenationLowering and VarargLowering to common
 lowers

(cherry picked from commit 79422eef4ddbde3c17adc19417b9412a59d5da7b)
---
 .../{konan => common}/lower/StringConcatenationLowering.kt    | 4 +---
 .../kotlin/backend/{konan => common}/lower/VarargLowering.kt  | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{konan => common}/lower/StringConcatenationLowering.kt (96%)
 rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{konan => common}/lower/VarargLowering.kt (98%)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/StringConcatenationLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/StringConcatenationLowering.kt
similarity index 96%
rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/StringConcatenationLowering.kt
rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/StringConcatenationLowering.kt
index eb0d64606c7..83b708cddd9 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/StringConcatenationLowering.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/StringConcatenationLowering.kt
@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.backend.konan.lower
+package org.jetbrains.kotlin.backend.common.lower
 
 import org.jetbrains.kotlin.backend.common.CommonBackendContext
 import org.jetbrains.kotlin.backend.common.FileLoweringPass
 import org.jetbrains.kotlin.backend.common.atMostOne
-import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
-import org.jetbrains.kotlin.backend.common.lower.irBlock
 import org.jetbrains.kotlin.builtins.PrimitiveType
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.builders.*
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/VarargLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/VarargLowering.kt
similarity index 98%
rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/VarargLowering.kt
rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/VarargLowering.kt
index b849607f4e3..f08e2956dba 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/VarargLowering.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/VarargLowering.kt
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.backend.konan.lower
+package org.jetbrains.kotlin.backend.common.lower
 
 import org.jetbrains.kotlin.backend.common.CommonBackendContext
 import org.jetbrains.kotlin.backend.common.DeclarationContainerLoweringPass
-import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
 import org.jetbrains.kotlin.backend.konan.descriptors.synthesizedString
 import org.jetbrains.kotlin.backend.common.ir.ir2string
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
@@ -40,7 +39,6 @@ import org.jetbrains.kotlin.ir.util.functions
 import org.jetbrains.kotlin.ir.util.getPropertyGetter
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
 import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
-import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.util.OperatorNameConventions