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

[IR] Pass input value to AbstractNamedCompilerPhase.runAfter

Browse Source 
It is needed for the K/N dynamic compiler driver where phase input
might be required for actions performed after its execution.
This commit is contained in:
Sergey Bogolepov
2023-01-19 12:53:11 +02:00
committed by Space Team
parent c22285f824
commit 5bd405856f
1 changed files with 6 additions and 6 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
+6 -6
View File
@@ -94,7 +94,7 @@ abstract class AbstractNamedCompilerPhase<in Context : LoggingContext, Input, Ou
phaseBody(phaseConfig, phaserState, context, input) phaseBody(phaseConfig, phaserState, context, input)
} }
} }
runAfter(phaseConfig, changePhaserStateType(phaserState), context, output) runAfter(phaseConfig, changePhaserStateType(phaserState), context, input, output)
phaserState.alreadyDone.add(this) phaserState.alreadyDone.add(this)
phaserState.phaseCount++ phaserState.phaseCount++
@@ -110,7 +110,7 @@ abstract class AbstractNamedCompilerPhase<in Context : LoggingContext, Input, Ou
abstract fun runBefore(phaseConfig: PhaseConfigurationService, phaserState: PhaserState<Input>, context: Context, input: Input) abstract fun runBefore(phaseConfig: PhaseConfigurationService, phaserState: PhaserState<Input>, context: Context, input: Input)
abstract fun runAfter(phaseConfig: PhaseConfigurationService, phaserState: PhaserState<Output>, context: Context, output: Output) abstract fun runAfter(phaseConfig: PhaseConfigurationService, phaserState: PhaserState<Output>, context: Context, input: Input, output: Output)
private fun runAndProfile(phaseConfig: PhaseConfigurationService, phaserState: PhaserState<Input>, context: Context, source: Input): Output { private fun runAndProfile(phaseConfig: PhaseConfigurationService, phaserState: PhaserState<Input>, context: Context, source: Input): Output {
var result: Output? = null var result: Output? = null
@@ -161,7 +161,7 @@ class NamedCompilerPhase<in Context : LoggingContext, Data>(
} }
} }
override fun runAfter(phaseConfig: PhaseConfigurationService, phaserState: PhaserState<Data>, context: Context, output: Data) { override fun runAfter(phaseConfig: PhaseConfigurationService, phaserState: PhaserState<Data>, context: Context, input: Data, output: Data) {
val state = ActionState(phaseConfig, this, phaserState.phaseCount, BeforeOrAfter.AFTER) val state = ActionState(phaseConfig, this, phaserState.phaseCount, BeforeOrAfter.AFTER)
for (action in actions) action(state, output, context) for (action in actions) action(state, output, context)
@@ -193,7 +193,7 @@ abstract class SimpleNamedCompilerPhase<in Context : LoggingContext, Input, Outp
preconditions: Set<Checker<Input>> = emptySet(), preconditions: Set<Checker<Input>> = emptySet(),
postconditions: Set<Checker<Output>> = emptySet(), postconditions: Set<Checker<Output>> = emptySet(),
private val preactions: Set<Action<Input, Context>> = emptySet(), private val preactions: Set<Action<Input, Context>> = emptySet(),
private val postactions: Set<Action<Output, Context>> = emptySet(), private val postactions: Set<Action<Pair<Input, Output>, Context>> = emptySet(),
nlevels: Int = 0, nlevels: Int = 0,
) : AbstractNamedCompilerPhase<Context, Input, Output>( ) : AbstractNamedCompilerPhase<Context, Input, Output>(
name, name,
@@ -220,9 +220,9 @@ abstract class SimpleNamedCompilerPhase<in Context : LoggingContext, Input, Outp
} }
} }
override fun runAfter(phaseConfig: PhaseConfigurationService, phaserState: PhaserState<Output>, context: Context, output: Output) { override fun runAfter(phaseConfig: PhaseConfigurationService, phaserState: PhaserState<Output>, context: Context, input: Input, output: Output) {
val state = ActionState(phaseConfig, this, phaserState.phaseCount, BeforeOrAfter.AFTER) val state = ActionState(phaseConfig, this, phaserState.phaseCount, BeforeOrAfter.AFTER)
for (action in postactions) action(state, output, context) for (action in postactions) action(state, input to output, context)
if (phaseConfig.checkConditions) { if (phaseConfig.checkConditions) {
for (post in postconditions) post(output) for (post in postconditions) post(output)