From 7b730544ead7d22e1b4693c12e88b3381698d088 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Fri, 3 Aug 2018 14:47:43 +0300 Subject: [PATCH] [kotlin compiler][update] 1.2.70-dev-915 --- .../jetbrains/kotlin/backend/konan/llvm/LlvmDeclarations.kt | 2 ++ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmDeclarations.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmDeclarations.kt index 61d70bbbb04..e23275aa1b9 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmDeclarations.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmDeclarations.kt @@ -132,6 +132,8 @@ private fun Context.getDeclaredFields(classDescriptor: ClassDescriptor): List null } } + // TODO: hack over missed parents in deserialized fields/property declarations. + fields.forEach{it.parent = irClass} return fields.sortedBy { it.fqNameSafe.localHash.value diff --git a/gradle.properties b/gradle.properties index 0281dfeba6d..631ae4c0cea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,8 +20,8 @@ remoteRoot=konan_tests #kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-SNAPSHOT # Download artifacts of https://teamcity.jetbrains.com/viewType.html?buildTypeId=Kotlin_120_Compiler testDataVersion=1226829:id -kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.2.70-dev-764,tag:kotlin-native,pinned:true/artifacts/content/maven -kotlinVersion=1.2.70-dev-764 +kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.2.70-dev-915,tag:kotlin-native,pinned:true/artifacts/content/maven +kotlinVersion=1.2.70-dev-915 konanVersion=0.9 org.gradle.jvmargs='-Dfile.encoding=UTF-8'