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

Lift restrictions on Context in CompilerPhase

Browse Source 
CommonBackendContext is a complex interface that
actually requires many things to be instantiated.
We don't need it for many parts of compilation pipeline:
frontend or object files phases in native backend would
work just fine without CommonBackendContext.
This commit is contained in:
Sergey Bogolepov
2022-10-03 12:21:23 +03:00
committed by Space Team
parent e1f2b89875
commit 3a500e536a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/phaser/CompilerPhase.kt
+5 -5
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.backend.common.phaser package org.jetbrains.kotlin.backend.common.phaser
import org.jetbrains.kotlin.backend.common.CommonBackendContext import org.jetbrains.kotlin.backend.common.LoggingContext
import kotlin.system.measureTimeMillis import kotlin.system.measureTimeMillis
class PhaserState<Data>( class PhaserState<Data>(
@@ -27,7 +27,7 @@ inline fun <R, D> PhaserState<D>.downlevel(nlevels: Int, block: () -> R): R {
return result return result
} }
interface CompilerPhase<in Context : CommonBackendContext, Input, Output> { interface CompilerPhase<in Context : LoggingContext, Input, Output> {
fun invoke(phaseConfig: PhaseConfigurationService, phaserState: PhaserState<Input>, context: Context, input: Input): Output fun invoke(phaseConfig: PhaseConfigurationService, phaserState: PhaserState<Input>, context: Context, input: Input): Output
fun getNamedSubphases(startDepth: Int = 0): List<Pair<Int, NamedCompilerPhase<Context, *>>> = emptyList() fun getNamedSubphases(startDepth: Int = 0): List<Pair<Int, NamedCompilerPhase<Context, *>>> = emptyList()
@@ -36,13 +36,13 @@ interface CompilerPhase<in Context : CommonBackendContext, Input, Output> {
val stickyPostconditions: Set<Checker<Output>> get() = emptySet() val stickyPostconditions: Set<Checker<Output>> get() = emptySet()
} }
fun <Context : CommonBackendContext, Input, Output> CompilerPhase<Context, Input, Output>.invokeToplevel( fun <Context : LoggingContext, Input, Output> CompilerPhase<Context, Input, Output>.invokeToplevel(
phaseConfig: PhaseConfig, phaseConfig: PhaseConfig,
context: Context, context: Context,
input: Input input: Input
): Output = invoke(phaseConfig, PhaserState(), context, input) ): Output = invoke(phaseConfig, PhaserState(), context, input)
interface SameTypeCompilerPhase<in Context : CommonBackendContext, Data> : CompilerPhase<Context, Data, Data> interface SameTypeCompilerPhase<in Context : LoggingContext, Data> : CompilerPhase<Context, Data, Data>
// A failing checker should just throw an exception. // A failing checker should just throw an exception.
typealias Checker<Data> = (Data) -> Unit typealias Checker<Data> = (Data) -> Unit
@@ -66,7 +66,7 @@ infix operator fun <Data, Context> Action<Data, Context>.plus(other: Action<Data
other(phaseState, data, context) other(phaseState, data, context)
} }
class NamedCompilerPhase<in Context : CommonBackendContext, Data>( class NamedCompilerPhase<in Context : LoggingContext, Data>(
val name: String, val name: String,
val description: String, val description: String,
val prerequisite: Set<NamedCompilerPhase<Context, *>> = emptySet(), val prerequisite: Set<NamedCompilerPhase<Context, *>> = emptySet(),