From 6565a5eb2392ed417f0967b3cc2cf6c077e814e6 Mon Sep 17 00:00:00 2001
From: Nikolay Igotti <nikolay.igotti@jetbrains.com>
Date: Sun, 11 Dec 2016 20:40:17 +0300
Subject: [PATCH] Fix broken build.

---
 backend.native/build.gradle                                 | 4 ++--
 .../src/org/jetbrains/kotlin/backend/konan/llvm/Context.kt  | 6 +++++-
 .../org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt  | 5 ++++-
 .../kotlin/backend/konan/llvm/MetadataGenerator.kt          | 3 ++-
 gradle.properties                                           | 3 +--
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/backend.native/build.gradle b/backend.native/build.gradle
index e8d6c26c3da..783bac23a94 100644
--- a/backend.native/build.gradle
+++ b/backend.native/build.gradle
@@ -24,8 +24,8 @@ apply plugin: org.jetbrains.kotlin.NativeInteropPlugin
 allprojects {
     repositories {
         maven {
-            // url 'http://oss.sonatype.org/content/repositories/snapshots'
-            url 'http://dl.bintray.com/kotlin/kotlin-dev'
+            url 'http://oss.sonatype.org/content/repositories/snapshots'
+            //url 'http://dl.bintray.com/kotlin/kotlin-dev'
         }
     }
 
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Context.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Context.kt
index c0b81c3e744..144da676225 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Context.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Context.kt
@@ -3,8 +3,12 @@ package org.jetbrains.kotlin.backend.konan.llvm
 import llvm.*
 import org.jetbrains.kotlin.backend.konan.ModuleIndex
 import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
+import org.jetbrains.kotlin.resolve.BindingContext
 
-internal class Context(val irModule: IrModuleFragment, val runtime: Runtime, val llvmModule: LLVMModuleRef) {
+internal class Context(val irModule: IrModuleFragment,
+                       val runtime: Runtime,
+                       val llvmModule: LLVMModuleRef,
+                       val bindingContext: BindingContext) {
     val moduleIndex = ModuleIndex(irModule)
 
     private fun importFunction(name: String, otherModule: LLVMModuleRef): LLVMValueRef {
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
index c7ba0045d35..b20c69392a8 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
 import org.jetbrains.kotlin.ir.visitors.acceptVoid
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.descriptorUtil.classId
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
@@ -31,7 +32,9 @@ fun emitLLVM(module: IrModuleFragment, runtimeFile: String, outFile: String) {
     LLVMSetDataLayout(llvmModule, runtime.dataLayout)
     LLVMSetTarget(llvmModule, runtime.target)
 
-    val context = Context(module, runtime, llvmModule) // TODO: dispose
+    // TODO: shall we provide better binding context?
+    val context = Context(
+            module, runtime, llvmModule, BindingContext.EMPTY) // TODO: dispose
 
     module.acceptVoid(RTTIGeneratorVisitor(context))
     println("\n--- Generate bitcode ------------------------------------------------------\n")
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/MetadataGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/MetadataGenerator.kt
index 03ca79842df..d6373e73111 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/MetadataGenerator.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/MetadataGenerator.kt
@@ -181,7 +181,8 @@ internal class MetadataGenerator(override val context: Context): ContextUtils {
              )
 
         // TODO: eliminate this dependency on JavaScript compiler
-        val blobString =  KotlinJavascriptSerializationUtil.metadataAsString(description)
+        val blobString =  KotlinJavascriptSerializationUtil.metadataAsString(
+                context.bindingContext, description)
         if (false) {
             debug_blob(blobString)
         }
diff --git a/gradle.properties b/gradle.properties
index c38304891d1..64b0e4071b9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,4 @@
 #kotlin_version=1.1-M02
 kotlin_version=1.1-M03
 #kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20161201.112229-281
-#kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20161202.152649-287
-kotlinCompilerModule=org.jetbrains.kotlin:kotlin-android-extensions:1.1.0-dev-5173
+kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20161209.125829-302