From 11c330effd69281286542b3085c13e8a2e73b7c0 Mon Sep 17 00:00:00 2001
From: Roman Artemev <Roman.Artemev@jetbrains.com>
Date: Wed, 16 May 2018 17:38:01 +0300
Subject: [PATCH] [JS IR BE] Move builder into appropriate package

---
 .../js/lower/CallableReferenceLowering.kt     |  2 ++
 .../backend/js/lower/SecondaryCtorLowering.kt |  4 ++--
 .../{descriptors => symbols}/SymbolBuilder.kt | 24 +++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)
 rename compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/{descriptors => symbols}/SymbolBuilder.kt (86%)

diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CallableReferenceLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CallableReferenceLowering.kt
index cbe7b0e45f2..3b1af309f4b 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CallableReferenceLowering.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CallableReferenceLowering.kt
@@ -16,6 +16,8 @@ import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext
 import org.jetbrains.kotlin.ir.backend.js.ir.JsIrBuilder
+import org.jetbrains.kotlin.ir.backend.js.symbols.JsSymbolBuilder
+import org.jetbrains.kotlin.ir.backend.js.symbols.initialize
 import org.jetbrains.kotlin.ir.backend.js.utils.Namer
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrValueParameterImpl
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/SecondaryCtorLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/SecondaryCtorLowering.kt
index b254d56e384..fa1e2015f05 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/SecondaryCtorLowering.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/SecondaryCtorLowering.kt
@@ -11,9 +11,9 @@ import org.jetbrains.kotlin.descriptors.impl.LazyClassReceiverParameterDescripto
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext
-import org.jetbrains.kotlin.ir.backend.js.descriptors.JsSymbolBuilder
-import org.jetbrains.kotlin.ir.backend.js.descriptors.initialize
 import org.jetbrains.kotlin.ir.backend.js.ir.JsIrBuilder
+import org.jetbrains.kotlin.ir.backend.js.symbols.JsSymbolBuilder
+import org.jetbrains.kotlin.ir.backend.js.symbols.initialize
 import org.jetbrains.kotlin.ir.backend.js.utils.Namer
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrFunctionImpl
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/descriptors/SymbolBuilder.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/symbols/SymbolBuilder.kt
similarity index 86%
rename from compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/descriptors/SymbolBuilder.kt
rename to compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/symbols/SymbolBuilder.kt
index 048fcb85ee5..d738fd1d0f0 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/descriptors/SymbolBuilder.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/symbols/SymbolBuilder.kt
@@ -3,9 +3,8 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.ir.backend.js.descriptors
+package org.jetbrains.kotlin.ir.backend.js.symbols
 
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.descriptors.impl.FunctionDescriptorImpl
@@ -18,7 +17,6 @@ import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.symbols.impl.IrSimpleFunctionSymbolImpl
 import org.jetbrains.kotlin.ir.symbols.impl.IrValueParameterSymbolImpl
 import org.jetbrains.kotlin.ir.symbols.impl.IrVariableSymbolImpl
-import org.jetbrains.kotlin.ir.symbols.impl.createFunctionSymbol
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.types.KotlinType
 
@@ -53,13 +51,13 @@ object JsSymbolBuilder {
     )
 
     fun buildVar(
-        containingSymbol: IrFunctionSymbol,
-        name: String,
+        containingDeclaration: DeclarationDescriptor,
         type: KotlinType,
+        name: String,
         mutable: Boolean = false
     ) = IrVariableSymbolImpl(
         LocalVariableDescriptor(
-            containingSymbol.descriptor,
+            containingDeclaration,
             Annotations.EMPTY,
             Name.identifier(name),
             type,
@@ -69,14 +67,14 @@ object JsSymbolBuilder {
         )
     )
 
-
-    fun buildTempVar(containingSymbol: IrFunctionSymbol, type: KotlinType, name: String? = null, mutable: Boolean = false) = IrVariableSymbolImpl(
-        IrTemporaryVariableDescriptorImpl(
-            containingSymbol.descriptor,
-            Name.identifier(name ?: "tmp"),
-            type, mutable
+    fun buildTempVar(containingSymbol: IrFunctionSymbol, type: KotlinType, name: String? = null, mutable: Boolean = false) =
+        IrVariableSymbolImpl(
+            IrTemporaryVariableDescriptorImpl(
+                containingSymbol.descriptor,
+                Name.identifier(name ?: "tmp"),
+                type, mutable
+            )
         )
-    )
 }