From b19d02885d89aeaaf8d7fd2d783eb24ed993ef1a Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Tue, 26 Mar 2019 19:51:10 +0300 Subject: [PATCH] [kotlin compiler][update] 1.3.40-dev-990 --- .../org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt | 2 +- .../kotlin/backend/konan/lower/loops/HeaderProcessor.kt | 4 ++-- .../jetbrains/kotlin/ir/util/IrUnboundSymbolReplacer.kt | 4 ++-- gradle.properties | 7 +++---- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt index fb49bb1c8d0..d5c884e4375 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt @@ -2102,7 +2102,7 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map icmpEq(args[0], args[1]) - function == ib.booleanNotFun -> icmpNe(args[0], kTrue) + function.symbol == ib.booleanNotSymbol -> icmpNe(args[0], kTrue) function.isComparisonFunction(ib.greaterFunByOperandType) -> { if (args[0].type.isFloatingPoint()) fcmpGt(args[0], args[1]) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/loops/HeaderProcessor.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/loops/HeaderProcessor.kt index f5391fbfe1c..449382392cd 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/loops/HeaderProcessor.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/loops/HeaderProcessor.kt @@ -63,10 +63,10 @@ internal class ProgressionLoopHeader( override fun buildBody(builder: DeclarationIrBuilder, loop: IrLoop, newBody: IrExpression?): IrLoop = with (builder) { assert(loopVariable != null) val newCondition = irCall(context.irBuiltIns.booleanNotSymbol).apply { - putValueArgument(0, irCall(context.irBuiltIns.eqeqSymbol).apply { + dispatchReceiver = irCall(context.irBuiltIns.eqeqSymbol).apply { putValueArgument(0, irGet(loopVariable!!)) putValueArgument(1, irGet(last)) - }) + } } IrDoWhileLoopImpl(loop.startOffset, loop.endOffset, loop.type, loop.origin).apply { label = loop.label 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 4bc5cee3bc7..57f9f192784 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 @@ -24,7 +24,7 @@ internal fun IrModuleFragment.replaceUnboundSymbols(context: Context) { val collector = DeclarationSymbolCollector() with(collector) { with(irBuiltins) { - for (op in arrayOf(eqeqeqFun, eqeqFun, throwNpeFun, booleanNotFun, noWhenBranchMatchedExceptionFun) + + for (op in arrayOf(eqeqeqFun, eqeqFun, throwNpeFun, noWhenBranchMatchedExceptionFun) + lessFunByOperandType.values + lessOrEqualFunByOperandType.values + greaterOrEqualFunByOperandType.values + @@ -319,7 +319,7 @@ private class IrUnboundSymbolReplacer( expression.transformChildrenVoid(this) return with(expression) { - IrLocalDelegatedPropertyReferenceImpl(startOffset, endOffset, type, descriptor, + IrLocalDelegatedPropertyReferenceImpl(startOffset, endOffset, type, symbol, delegate, getter, setter, origin).also { it.copyArgumentsFrom(this) diff --git a/gradle.properties b/gradle.properties index e887026d921..7632d302bdd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,10 +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-937,branch:default:true,pinned:true/artifacts/content/maven -kotlinVersion=1.3.40-dev-937 -testKotlinVersion=1.3.40-dev-937 -# See https://teamcity.jetbrains.com/viewType.html?buildTypeId=Kotlin_KotlinNativeShared_BuildAndTest. +kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.40-dev-990,branch:default:true,pinned:true/artifacts/content/maven +kotlinVersion=1.3.40-dev-990 +testKotlinVersion=1.3.40-dev-990 sharedRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinNativeShared_BuildAndTest),number:1.0-dev-23,branch:default:true,pinned:true/artifacts/content/maven sharedVersion=1.0-dev-23 konanVersion=1.3.0