From 00dc4524cae28aeecace778cae59f940f7865c97 Mon Sep 17 00:00:00 2001
From: vvlevchenko <vasily.v.levchenko@gmail.com>
Date: Tue, 6 Jun 2017 11:56:31 -0700
Subject: [PATCH] [Kotlin compiler][update] 1.1.4-dev-600 (#639)

---
 .../cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt       | 3 ++-
 .../src/org/jetbrains/kotlin/backend/common/ir/Ir.kt         | 2 +-
 .../src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt          | 2 +-
 .../org/jetbrains/kotlin/ir/util/IrUnboundSymbolReplacer.kt  | 5 ++---
 gradle.properties                                            | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt b/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt
index 77d2b83fa91..d0b328c2038 100644
--- a/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt
+++ b/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt
@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.backend.konan.util.profile
 import org.jetbrains.kotlin.backend.konan.util.suffixIfNot
 import org.jetbrains.kotlin.backend.konan.util.removeSuffixIfPresent
 import org.jetbrains.kotlin.cli.common.CLICompiler
+import org.jetbrains.kotlin.cli.common.CLITool
 import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
@@ -165,7 +166,7 @@ class K2Native : CLICompiler<K2NativeCompilerArguments>() {
     companion object {
         @JvmStatic fun main(args: Array<String>) {
             profile("Total compiler main()") {
-                CLICompiler.doMain(K2Native(), args)
+                CLITool.doMain(K2Native(), args)
             }
         }
     }
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt
index 47f8515988c..6751e8882d9 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.ir.declarations.IrFunction
 import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.psi2ir.generators.SymbolTable
+import org.jetbrains.kotlin.ir.util.SymbolTable
 import org.jetbrains.kotlin.util.OperatorNameConventions
 
 // This is what Context collects about IR.
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt
index c26ef50e7d2..426ddd9be61 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.backend.konan.Context
 import org.jetbrains.kotlin.backend.konan.ValueType
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
-import org.jetbrains.kotlin.psi2ir.generators.SymbolTable
+import org.jetbrains.kotlin.ir.util.SymbolTable
 import kotlin.properties.Delegates
 
 // This is what Context collects about IR.
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUnboundSymbolReplacer.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUnboundSymbolReplacer.kt
index 07c70027a3a..02f0846f3ff 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUnboundSymbolReplacer.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUnboundSymbolReplacer.kt
@@ -19,8 +19,6 @@ import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol
 import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol
 import org.jetbrains.kotlin.ir.symbols.IrSymbol
 import org.jetbrains.kotlin.ir.visitors.*
-import org.jetbrains.kotlin.psi2ir.generators.ModuleDependenciesGenerator
-import org.jetbrains.kotlin.psi2ir.generators.SymbolTable
 
 @Deprecated("")
 internal fun IrModuleFragment.replaceUnboundSymbols(context: Context) {
@@ -41,7 +39,8 @@ internal fun IrModuleFragment.replaceUnboundSymbols(context: Context) {
     this.transformChildrenVoid(IrUnboundSymbolReplacer(symbolTable, collector.descriptorToSymbol))
 
     // Generate missing external stubs:
-    ModuleDependenciesGenerator(context.psi2IrGeneratorContext).generateUnboundSymbolsAsDependencies(this)
+    // TODO: ModuleGenerator::generateUnboundSymbolsAsDependencies(IRModuleFragment) is private function :/
+    ExternalDependenciesGenerator(symbolTable = context.psi2IrGeneratorContext.symbolTable, irBuiltIns = context.irBuiltIns).generateUnboundSymbolsAsDependencies(this)
 
     // Merge duplicated module and package declarations:
     this.acceptVoid(object : IrElementVisitorVoid {
diff --git a/gradle.properties b/gradle.properties
index 2ef7f99d29b..1f03e17d697 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,6 +24,6 @@ testDataVersion=1067176:id
 kotlinCompilerRepo=http://dl.bintray.com/jetbrains/kotlin-native-dependencies
 #kotlinCompilerRepo=http://oss.sonatype.org/content/repositories/snapshots
 #kotlinCompilerRepo=http://dl.bintray.com/kotlin/kotlin-dev
-kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20170521.012435-545
+kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20170606.151359-570
 konanVersion=0.2
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
\ No newline at end of file