From 15d522c2fecff8837038329df26161bcb06f8516 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Tue, 6 Nov 2018 12:48:28 +0300 Subject: [PATCH] [kotlin compiler][update] 1.3.20-dev-1427 --- .../src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt | 7 +++++++ backend.native/tests/build.gradle | 3 --- gradle.properties | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) 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 febd0358e97..f8472abac71 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 @@ -114,6 +114,13 @@ internal class KonanIr(context: Context, irModule: IrModuleFragment): Ir(context, lazySymbolTable) { + /** + * @note: + * [lateinitIsInitializedPropertyGetter] is used in [org.jetbrains.kotlin.backend.common.lower.LateinitLowering] and + * it's irrelevant for [org.jetbrains.kotlin.backend.konan.lower.LateinitLowering]. + */ + override val lateinitIsInitializedPropertyGetter: IrSimpleFunctionSymbol + get() = TODO("unimplemented") val entryPoint = findMainEntryPoint(context)?.let { symbolTable.referenceSimpleFunction(it) } diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle index 62ed0cf9f5d..663d4ae9c8d 100644 --- a/backend.native/tests/build.gradle +++ b/backend.native/tests/build.gradle @@ -2990,9 +2990,6 @@ task library_mismatch(type: RunStandaloneKonanTest) { def messages = "warning: skipping $dir/1.2/empty.klib. The library versions don't match. Expected '5.6', found '1.2'\n" + "warning: skipping $dir/3.4/empty.klib. The target doesn't match. Expected '$currentTarget', found [$someOtherTarget]\n" + - "${project.rootProject.projectDir.path}/test.output/local/library_mismatch/hello.kt:1:10: warning: parameter 'args' is never used\n" + - "fun main(args: Array) {\n" + - " ^\n" + "Hello, versioned world!\n" goldValue = isWindows() ? messages.replaceAll('\\/', '\\\\') : messages } diff --git a/gradle.properties b/gradle.properties index 160fd95508e..48ac52c0e5a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,9 +19,9 @@ buildKotlinVersion=1.3.0-rc-116 buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_130_CompilerAllPlugins),number:1.3.0-rc-116,tag:kotlin-native,pinned:true/artifacts/content/maven remoteRoot=konan_tests testDataVersion=1226829:id -kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.20-dev-1253,tag:kotlin-native,pinned:true/artifacts/content/maven -kotlinVersion=1.3.20-dev-1253 -testKotlinVersion=1.3.20-dev-1253 +kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.20-dev-1427,tag:kotlin-native,pinned:true/artifacts/content/maven +kotlinVersion=1.3.20-dev-1427 +testKotlinVersion=1.3.20-dev-1427 konanVersion=1.1.0 org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.workers.max=4