Fix broken build.
This commit is contained in:
@@ -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'
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+5
-1
@@ -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 {
|
||||
|
||||
+4
-1
@@ -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")
|
||||
|
||||
+2
-1
@@ -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)
|
||||
}
|
||||
|
||||
+1
-2
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user