From 0593375c967a0d7d30b7ed7449daf246a96ce69a Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Mon, 4 Mar 2019 11:51:09 +0300 Subject: [PATCH] [kotlin compiler][update] 1.3.40-dev-162 --- .../backend/konan/KonanLoweringPhases.kt | 6 +++--- .../kotlin/backend/konan/ToplevelPhases.kt | 20 +++++++++---------- gradle.properties | 8 ++++---- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLoweringPhases.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLoweringPhases.kt index 03345c64cc6..b6cee41eb2d 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLoweringPhases.kt +++ b/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 { - override fun invoke(phaseConfig: PhaseConfig, phaserState: PhaserState, context: Context, input: IrFile): IrFile { + override fun invoke(phaseConfig: PhaseConfig, phaserState: PhaserState, 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 { - override fun invoke(phaseConfig: PhaseConfig, phaserState: PhaserState, context: Context, input: IrModuleFragment): IrModuleFragment { + override fun invoke(phaseConfig: PhaseConfig, phaserState: PhaserState, 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 { - override fun invoke(phaseConfig: PhaseConfig, phaserState: PhaserState, context: Context, input: IrModuleFragment): IrModuleFragment { + override fun invoke(phaseConfig: PhaseConfig, phaserState: PhaserState, context: Context, input: IrModuleFragment): IrModuleFragment { FunctionInlining(context).inline(input) return input } diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt index bcadc0a5a8d..db6e31e73e9 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt +++ b/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 { - override fun invoke(phaseConfig: PhaseConfig, phaserState: PhaserState, context: Context, irModule: IrModuleFragment): IrModuleFragment { - + override fun invoke(phaseConfig: PhaseConfig, phaserState: PhaserState, context: Context, input: IrModuleFragment): IrModuleFragment { val files = mutableListOf() - 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( diff --git a/gradle.properties b/gradle.properties index 9b4671cb044..b9377fe482a 100644 --- a/gradle.properties +++ b/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