From f043a6bf58d2c0d0be8c0c0be4bcefd600837981 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Mon, 11 Mar 2019 12:13:30 +0300 Subject: [PATCH] [kotlin compiler][update] 1.3.40-dev-392 --- .../kotlin/ir/util/IrUnboundSymbolReplacer.kt | 2 +- gradle.properties | 6 +- .../main/kotlin/generated/_UArraysNative.kt | 71 +++++++++++++++++++ 3 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 runtime/src/main/kotlin/generated/_UArraysNative.kt 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 d2372690aad..4bc5cee3bc7 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 @@ -46,7 +46,7 @@ internal fun IrModuleFragment.replaceUnboundSymbols(context: Context) { context.moduleDescriptor, symbolTable = context.psi2IrGeneratorContext.symbolTable, irBuiltIns = context.irBuiltIns - ).generateUnboundSymbolsAsDependencies(this) + ).generateUnboundSymbolsAsDependencies() } private fun IrModuleFragment.mergeFrom(other: IrModuleFragment): Unit { diff --git a/gradle.properties b/gradle.properties index b9377fe482a..3078e8a5e59 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,9 +18,9 @@ buildKotlinVersion=1.3.30-dev-1945 buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.30-dev-1945,pinned:true/artifacts/content/maven remoteRoot=konan_tests -kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.40-dev-162,branch:default:true,pinned:true/artifacts/content/maven -kotlinVersion=1.3.40-dev-162 -testKotlinVersion=1.3.40-dev-162 +kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.40-dev-392,branch:default:true,pinned:true/artifacts/content/maven +kotlinVersion=1.3.40-dev-392 +testKotlinVersion=1.3.40-dev-392 konanVersion=1.3.0 org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.workers.max=4 diff --git a/runtime/src/main/kotlin/generated/_UArraysNative.kt b/runtime/src/main/kotlin/generated/_UArraysNative.kt new file mode 100644 index 00000000000..8f8eaee7f7c --- /dev/null +++ b/runtime/src/main/kotlin/generated/_UArraysNative.kt @@ -0,0 +1,71 @@ +/* + * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package kotlin.collections + + +/** + * Returns a [List] that wraps the original array. + */ +@SinceKotlin("1.3") +@ExperimentalUnsignedTypes +public actual fun UIntArray.asList(): List { + return object : AbstractList(), RandomAccess { + override val size: Int get() = this@asList.size + override fun isEmpty(): Boolean = this@asList.isEmpty() + override fun contains(element: UInt): Boolean = this@asList.contains(element) + override fun get(index: Int): UInt = this@asList[index] + override fun indexOf(element: UInt): Int = this@asList.indexOf(element) + override fun lastIndexOf(element: UInt): Int = this@asList.lastIndexOf(element) + } +} + +/** + * Returns a [List] that wraps the original array. + */ +@SinceKotlin("1.3") +@ExperimentalUnsignedTypes +public actual fun ULongArray.asList(): List { + return object : AbstractList(), RandomAccess { + override val size: Int get() = this@asList.size + override fun isEmpty(): Boolean = this@asList.isEmpty() + override fun contains(element: ULong): Boolean = this@asList.contains(element) + override fun get(index: Int): ULong = this@asList[index] + override fun indexOf(element: ULong): Int = this@asList.indexOf(element) + override fun lastIndexOf(element: ULong): Int = this@asList.lastIndexOf(element) + } +} + +/** + * Returns a [List] that wraps the original array. + */ +@SinceKotlin("1.3") +@ExperimentalUnsignedTypes +public actual fun UByteArray.asList(): List { + return object : AbstractList(), RandomAccess { + override val size: Int get() = this@asList.size + override fun isEmpty(): Boolean = this@asList.isEmpty() + override fun contains(element: UByte): Boolean = this@asList.contains(element) + override fun get(index: Int): UByte = this@asList[index] + override fun indexOf(element: UByte): Int = this@asList.indexOf(element) + override fun lastIndexOf(element: UByte): Int = this@asList.lastIndexOf(element) + } +} + +/** + * Returns a [List] that wraps the original array. + */ +@SinceKotlin("1.3") +@ExperimentalUnsignedTypes +public actual fun UShortArray.asList(): List { + return object : AbstractList(), RandomAccess { + override val size: Int get() = this@asList.size + override fun isEmpty(): Boolean = this@asList.isEmpty() + override fun contains(element: UShort): Boolean = this@asList.contains(element) + override fun get(index: Int): UShort = this@asList[index] + override fun indexOf(element: UShort): Int = this@asList.indexOf(element) + override fun lastIndexOf(element: UShort): Int = this@asList.lastIndexOf(element) + } +}