azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[kotlin compiler][update] 1.3.40-dev-990

Browse Source
This commit is contained in:
Alexander Gorshenev
2019-03-26 19:51:10 +03:00
committed by alexander-gorshenev
parent ed44620814
commit b19d02885d
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
+1 -1
View File
@@ -2102,7 +2102,7 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
with(functionGenerationContext) { with(functionGenerationContext) {
return when { return when {
function == ib.eqeqeqFun -> icmpEq(args[0], args[1]) function == ib.eqeqeqFun -> icmpEq(args[0], args[1])
function == ib.booleanNotFun -> icmpNe(args[0], kTrue) function.symbol == ib.booleanNotSymbol -> icmpNe(args[0], kTrue)
function.isComparisonFunction(ib.greaterFunByOperandType) -> { function.isComparisonFunction(ib.greaterFunByOperandType) -> {
if (args[0].type.isFloatingPoint()) fcmpGt(args[0], args[1]) if (args[0].type.isFloatingPoint()) fcmpGt(args[0], args[1])
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/loops/HeaderProcessor.kt
+2 -2
View File
@@ -63,10 +63,10 @@ internal class ProgressionLoopHeader(
override fun buildBody(builder: DeclarationIrBuilder, loop: IrLoop, newBody: IrExpression?): IrLoop = with (builder) { override fun buildBody(builder: DeclarationIrBuilder, loop: IrLoop, newBody: IrExpression?): IrLoop = with (builder) {
assert(loopVariable != null) assert(loopVariable != null)
val newCondition = irCall(context.irBuiltIns.booleanNotSymbol).apply { 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(0, irGet(loopVariable!!))
putValueArgument(1, irGet(last)) putValueArgument(1, irGet(last))
}) }
} }
IrDoWhileLoopImpl(loop.startOffset, loop.endOffset, loop.type, loop.origin).apply { IrDoWhileLoopImpl(loop.startOffset, loop.endOffset, loop.type, loop.origin).apply {
label = loop.label label = loop.label
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUnboundSymbolReplacer.kt
+2 -2
View File
@@ -24,7 +24,7 @@ internal fun IrModuleFragment.replaceUnboundSymbols(context: Context) {
val collector = DeclarationSymbolCollector() val collector = DeclarationSymbolCollector()
with(collector) { with(collector) {
with(irBuiltins) { with(irBuiltins) {
for (op in arrayOf(eqeqeqFun, eqeqFun, throwNpeFun, booleanNotFun, noWhenBranchMatchedExceptionFun) + for (op in arrayOf(eqeqeqFun, eqeqFun, throwNpeFun, noWhenBranchMatchedExceptionFun) +
lessFunByOperandType.values + lessFunByOperandType.values +
lessOrEqualFunByOperandType.values + lessOrEqualFunByOperandType.values +
greaterOrEqualFunByOperandType.values + greaterOrEqualFunByOperandType.values +
@@ -319,7 +319,7 @@ private class IrUnboundSymbolReplacer(
expression.transformChildrenVoid(this) expression.transformChildrenVoid(this)
return with(expression) { return with(expression) {
IrLocalDelegatedPropertyReferenceImpl(startOffset, endOffset, type, descriptor, IrLocalDelegatedPropertyReferenceImpl(startOffset, endOffset, type, symbol,
delegate, getter, setter, origin).also { delegate, getter, setter, origin).also {
it.copyArgumentsFrom(this) it.copyArgumentsFrom(this)
gradle.properties
+3 -4
View File
@@ -18,10 +18,9 @@
buildKotlinVersion=1.3.30-dev-1945 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 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 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 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-937 kotlinVersion=1.3.40-dev-990
testKotlinVersion=1.3.40-dev-937 testKotlinVersion=1.3.40-dev-990
# See https://teamcity.jetbrains.com/viewType.html?buildTypeId=Kotlin_KotlinNativeShared_BuildAndTest.
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 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 sharedVersion=1.0-dev-23
konanVersion=1.3.0 konanVersion=1.3.0