From 285bfc11f8f0e0dd0a47e86ae5116d404f1ba6e6 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Mon, 3 Jun 2019 10:51:05 +0300 Subject: [PATCH] [kotlin compiler][update] 1.3.50-dev-770 --- .../jetbrains/kotlin/backend/konan/llvm/BinaryInterface.kt | 4 ++++ gradle.properties | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/BinaryInterface.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/BinaryInterface.kt index 548e3c91a13..b400576aafa 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/BinaryInterface.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/BinaryInterface.kt @@ -27,6 +27,7 @@ import org.jetbrains.kotlin.ir.util.fqNameForIrSerialization import org.jetbrains.kotlin.ir.util.isSuspend import org.jetbrains.kotlin.ir.util.isVararg import org.jetbrains.kotlin.konan.library.uniqueName +import org.jetbrains.kotlin.backend.konan.isInlinedNative import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name @@ -37,6 +38,9 @@ import org.jetbrains.kotlin.name.Name object KonanMangler : KotlinManglerImpl() { + override val IrType.isInlined + get() = this.isInlinedNative() + override val String.hashMangle get() = this.localHash.value /** diff --git a/gradle.properties b/gradle.properties index d2d0ef051b8..55193db7803 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,8 +18,8 @@ buildKotlinVersion=1.3.50-dev-630 buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-630,branch:default:any,pinned:true/artifacts/content/maven remoteRoot=konan_tests -kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-630,branch:default:any,pinned:true/artifacts/content/maven -kotlinVersion=1.3.50-dev-630 +kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-770,branch:default:any,pinned:true/artifacts/content/maven +kotlinVersion=1.3.50-dev-770 kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-630,branch:default:any,pinned:true/artifacts/content/maven kotlinStdlibVersion=1.3.50-dev-630 testKotlinCompilerVersion=1.3.50-dev-630