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

backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLoweringPhases.kt

@@ -36,7 +36,7 @@ internal fun makeKonanFileOpPhase(
 ) = namedIrFilePhase(
         name, description, prerequisite, nlevels = 0,
         lower = object : SameTypeCompilerPhase<Context, IrFile> {
-            override fun invoke(phaseConfig: PhaseConfig, phaserState: PhaserState, context: Context, input: IrFile): IrFile {
+            override fun invoke(phaseConfig: PhaseConfig, phaserState: PhaserState<IrFile>, context: Context, input: IrFile): IrFile {
                 op(context, input)
                 return input
             }
@@ -51,7 +51,7 @@ internal fun makeKonanModuleOpPhase(
 ) = namedIrModulePhase(
         name, description, prerequisite, nlevels = 0,
         lower = object : SameTypeCompilerPhase<Context, IrModuleFragment> {
-            override fun invoke(phaseConfig: PhaseConfig, phaserState: PhaserState, context: Context, input: IrModuleFragment): IrModuleFragment {
+            override fun invoke(phaseConfig: PhaseConfig, phaserState: PhaserState<IrModuleFragment>, context: Context, input: IrModuleFragment): IrModuleFragment {
                 op(context, input)
                 return input
             }
@@ -72,7 +72,7 @@ internal val lowerBeforeInlinePhase = makeKonanModuleLoweringPhase(
 
 internal val inlinePhase = namedIrModulePhase(
         lower = object : SameTypeCompilerPhase<Context, IrModuleFragment> {
-            override fun invoke(phaseConfig: PhaseConfig, phaserState: PhaserState, context: Context, input: IrModuleFragment): IrModuleFragment {
+            override fun invoke(phaseConfig: PhaseConfig, phaserState: PhaserState<IrModuleFragment>, context: Context, input: IrModuleFragment): IrModuleFragment {
                 FunctionInlining(context).inline(input)
                 return input
             }

backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt

@@ -223,11 +223,10 @@ internal val dependenciesLowerPhase = SameTypeNamedPhaseWrapper(
         prerequisite = emptySet(),
         dumperVerifier = EmptyDumperVerifier(),
         lower = object : CompilerPhase<Context, IrModuleFragment, IrModuleFragment> {
-            override fun invoke(phaseConfig: PhaseConfig, phaserState: PhaserState, context: Context, irModule: IrModuleFragment): IrModuleFragment {
-
+            override fun invoke(phaseConfig: PhaseConfig, phaserState: PhaserState<IrModuleFragment>, context: Context, input: IrModuleFragment): IrModuleFragment {
                 val files = mutableListOf<IrFile>()
-                files += irModule.files
-                irModule.files.clear()
+                files += input.files
+                input.files.clear()
 
                 // TODO: KonanLibraryResolver.TopologicalLibraryOrder actually returns libraries in the reverse topological order.
                 context.librariesWithDependencies
@@ -236,10 +235,10 @@ internal val dependenciesLowerPhase = SameTypeNamedPhaseWrapper(
                             val libModule = context.irModules[it.libraryName]
                                     ?: return@forEach
 
-                            irModule.files += libModule.files
-                            allLoweringsPhase.invoke(phaseConfig, phaserState, context, irModule)
+                            input.files += libModule.files
+                            allLoweringsPhase.invoke(phaseConfig, phaserState, context, input)
 
-                            irModule.files.clear()
+                            input.files.clear()
                         }
 
                 // Save all files for codegen in reverse topological order.
@@ -248,13 +247,12 @@ internal val dependenciesLowerPhase = SameTypeNamedPhaseWrapper(
                         .forEach {
                             val libModule = context.irModules[it.libraryName]
                                     ?: return@forEach
-                            irModule.files += libModule.files
+                            input.files += libModule.files
                         }
-                irModule.files += files
+                input.files += files
 
-                return irModule
+                return input
             }
-
         })
 
 internal val bitcodePhase = namedIrModulePhase(

gradle.properties

@@ -18,10 +18,10 @@
 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.30-dev-2076,branch:default:true,pinned:true/artifacts/content/maven
-kotlinVersion=1.3.30-dev-2076
-testKotlinVersion=1.3.30-dev-2076
-konanVersion=1.2.0
+kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.40-dev-162,branch:default:true,pinned:true/artifacts/content/maven
+kotlinVersion=1.3.40-dev-162
+testKotlinVersion=1.3.40-dev-162
+konanVersion=1.3.0
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 org.gradle.workers.max=4
 #kotlinProjectPath=/Users/jetbrains/kotlin-native/kotlin