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

[K/N] Turn NativeGenerationState into PhaseContext

Browse Source 
It allows to use NativeGenerationState as a PhaseContext in lowering
and codegen phases.
This commit is contained in:
Sergey Bogolepov
2022-12-01 12:41:25 +02:00
committed by Space Team
parent 8a9acfcab0
commit b8f9b07a5a
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/NativeGenerationState.kt
+7 -4
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.backend.konan package org.jetbrains.kotlin.backend.konan
import llvm.* import llvm.*
import org.jetbrains.kotlin.backend.konan.driver.BasicPhaseContext
import org.jetbrains.kotlin.backend.konan.llvm.* import org.jetbrains.kotlin.backend.konan.llvm.*
import org.jetbrains.kotlin.backend.konan.llvm.DebugInfo import org.jetbrains.kotlin.backend.konan.llvm.DebugInfo
import org.jetbrains.kotlin.backend.konan.llvm.Llvm import org.jetbrains.kotlin.backend.konan.llvm.Llvm
@@ -42,9 +43,11 @@ internal class FileLowerState {
"$prefix${cStubCount++}" "$prefix${cStubCount++}"
} }
internal class NativeGenerationState(val context: Context, val cacheDeserializationStrategy: CacheDeserializationStrategy?) { internal class NativeGenerationState(
private val config = context.config config: KonanConfig,
val context: Context,
val cacheDeserializationStrategy: CacheDeserializationStrategy?
) : BasicPhaseContext(config) {
private val outputPath = config.cacheSupport.tryGetImplicitOutput(cacheDeserializationStrategy) ?: config.outputPath private val outputPath = config.cacheSupport.tryGetImplicitOutput(cacheDeserializationStrategy) ?: config.outputPath
val outputFiles = OutputFiles(outputPath, config.target, config.produce) val outputFiles = OutputFiles(outputPath, config.target, config.produce)
val tempFiles = run { val tempFiles = run {
@@ -118,7 +121,7 @@ internal class NativeGenerationState(val context: Context, val cacheDeserializat
} }
private var isDisposed = false private var isDisposed = false
fun dispose() { override fun dispose() {
if (isDisposed) return if (isDisposed) return
if (hasDebugInfo()) { if (hasDebugInfo()) {
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt
+6 -2
View File
@@ -361,7 +361,11 @@ internal val umbrellaCompilation = SameTypeNamedCompilerPhase(
for (file in files) { for (file in files) {
if (file.isFunctionInterfaceFile) continue if (file.isFunctionInterfaceFile) continue
context.generationState = NativeGenerationState(context, CacheDeserializationStrategy.SingleFile(file.path, file.fqName.asString())) context.generationState = NativeGenerationState(
context.config,
context,
CacheDeserializationStrategy.SingleFile(file.path, file.fqName.asString())
)
module.files += file module.files += file
if (context.generationState.shouldDefineFunctionClasses) if (context.generationState.shouldDefineFunctionClasses)
@@ -449,7 +453,7 @@ internal val createGenerationStatePhase = namedUnitPhase(
description = "Create generation state", description = "Create generation state",
lower = object : CompilerPhase<Context, Unit, Unit> { lower = object : CompilerPhase<Context, Unit, Unit> {
override fun invoke(phaseConfig: PhaseConfigurationService, phaserState: PhaserState<Unit>, context: Context, input: Unit) { override fun invoke(phaseConfig: PhaseConfigurationService, phaserState: PhaserState<Unit>, context: Context, input: Unit) {
context.generationState = NativeGenerationState(context, context.config.libraryToCache?.strategy) context.generationState = NativeGenerationState(context.config, context, context.config.libraryToCache?.strategy)
} }
} }
) )