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 f262ced9406..f12711ec447 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 @@ -32,6 +32,9 @@ import org.jetbrains.kotlin.utils.KotlinPaths private class K2NativeCompilerPerformanceManager: CommonCompilerPerformanceManager("Kotlin to Native Compiler") class K2Native : CLICompiler() { + + override fun MutableList.addPlatformOptions(arguments: K2NativeCompilerArguments) {} + override fun createMetadataVersion(versionArray: IntArray): BinaryVersion = KlibMetadataVersion(*versionArray) override val performanceManager:CommonCompilerPerformanceManager by lazy { diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanBackendContext.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanBackendContext.kt index 1a016809145..63e2d9e1c8c 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanBackendContext.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanBackendContext.kt @@ -22,6 +22,8 @@ import org.jetbrains.kotlin.ir.declarations.IrFile import org.jetbrains.kotlin.builtins.konan.KonanBuiltIns import org.jetbrains.kotlin.ir.builders.IrBuilderWithScope import org.jetbrains.kotlin.ir.declarations.IrDeclaration +import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol +import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol import org.jetbrains.kotlin.name.Name internal abstract class KonanBackendContext(val config: KonanConfig) : CommonBackendContext { @@ -29,6 +31,10 @@ internal abstract class KonanBackendContext(val config: KonanConfig) : CommonBac abstract override val ir: KonanIr + override val transformedFunction: MutableMap + get() = TODO("not implemented") + override val scriptMode: Boolean = false + override val sharedVariablesManager by lazy { // Creating lazily because builtIns module seems to be incomplete during `link` test; // TODO: investigate this. diff --git a/gradle.properties b/gradle.properties index f0a9b7ee2de..7c43bc7970c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,12 +18,12 @@ buildKotlinVersion=1.3.60-dev-2755 buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.60-dev-2755,branch:default:any,pinned:true/artifacts/content/maven remoteRoot=konan_tests -kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.3.70-dev-352,branch:default:any,pinned:true/artifacts/content/maven -kotlinVersion=1.3.70-dev-352 -kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.3.70-dev-352,branch:default:any,pinned:true/artifacts/content/maven -kotlinStdlibVersion=1.3.70-dev-352 -kotlinStdlibTestsVersion=1.3.70-dev-352 -testKotlinCompilerVersion=1.3.70-dev-352 +kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.3.70-dev-478,branch:default:any,pinned:true/artifacts/content/maven +kotlinVersion=1.3.70-dev-478 +kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.3.70-dev-478,branch:default:any,pinned:true/artifacts/content/maven +kotlinStdlibVersion=1.3.70-dev-478 +kotlinStdlibTestsVersion=1.3.70-dev-478 +testKotlinCompilerVersion=1.3.70-dev-478 konanVersion=1.3.70 org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.workers.max=4