diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt index 794681fad41..3f25203352f 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt @@ -101,13 +101,6 @@ internal class KonanSymbols(context: Context, private val symbolTable: SymbolTab } }.toMap() - val list = symbolTable.referenceClass(builtIns.list) - val mutableList = symbolTable.referenceClass(builtIns.mutableList) - val set = symbolTable.referenceClass(builtIns.set) - val mutableSet = symbolTable.referenceClass(builtIns.mutableSet) - val map = symbolTable.referenceClass(builtIns.map) - val mutableMap = symbolTable.referenceClass(builtIns.mutableMap) - val arrayList = symbolTable.referenceClass(getArrayListClassDescriptor(context)) val symbolName = topLevelClass(RuntimeNames.symbolName) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSuspendFunctionLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSuspendFunctionLowering.kt index deecde73689..83c7bf9d1a4 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSuspendFunctionLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSuspendFunctionLowering.kt @@ -65,9 +65,10 @@ internal class NativeSuspendFunctionsLowering(ctx: Context): AbstractSuspendFunc ) } - override fun buildStateMachine(originalBody: IrBody, stateMachineFunction: IrFunction, + override fun buildStateMachine(stateMachineFunction: IrFunction, transformingFunction: IrFunction, argumentToPropertiesMap: Map) { + val originalBody = transformingFunction.body!! val resultArgument = stateMachineFunction.valueParameters.single() val coroutineClass = stateMachineFunction.parentAsClass diff --git a/gradle.properties b/gradle.properties index 83d0444b14e..01cf7c74dc9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,14 +15,14 @@ # # A version of the Kotlin "toolchain" (compiler, runtime, stdlib etc) used by the build script. -buildKotlinVersion=1.3.50-dev-44 -buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-44,pinned:true/artifacts/content/maven +buildKotlinVersion=1.3.50-dev-526 +buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-526,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-328,branch:default:true,pinned:true/artifacts/content/maven -kotlinVersion=1.3.50-dev-328 -kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-368,branch:default:true,pinned:true/artifacts/content/maven -kotlinStdlibVersion=1.3.50-dev-368 -testKotlinCompilerVersion=1.3.50-dev-328 +kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-560,branch:default:true,pinned:true/artifacts/content/maven +kotlinVersion=1.3.50-dev-560 +kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-560,branch:default:true,pinned:true/artifacts/content/maven +kotlinStdlibVersion=1.3.50-dev-560 +testKotlinCompilerVersion=1.3.50-dev-560 # See https://teamcity.jetbrains.com/project.html?projectId=Kotlin_KotlinNativeShared&tab=projectOverview sharedRepo=https://dl.bintray.com/jetbrains/kotlin-native-dependencies sharedVersion=1.0-dev-99