8000 [FIR2IR] Remove passing excess arguments to jvm backend functions and… · AndroidKotlinID/kotlin@0f9107c · GitHub
[go: up one dir, main page]
Skip to content

Commit 0f9107c

Browse files
KvanTTTSpace Team
KvanTTT
authored and
Space Team
committed
[FIR2IR] Remove passing excess arguments to jvm backend functions and classes
generateModuleInFrontendIRMode, runBackend FirJvmBackendExtension, ModuleCompilerIrBackendInput
1 parent e601b01 commit 0f9107c

File tree

7 files changed

+7
-20
lines changed

7 files changed

+7
-20
lines changed

‎compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ object FirKotlinToJvmBytecodeCompiler {
171171
allSources,
172172
fir2IrResult,
173173
fir2IrExtensions,
174-
firResult.platformOutput.session,
175174
diagnosticsReporter
176175
)
177176

@@ -310,7 +309,6 @@ object FirKotlinToJvmBytecodeCompiler {
310309
ktFiles: List<KtFile>,
311310
fir2IrResult: Fir2IrResult,
312311
extensions: JvmGeneratorExtensions,
313-
session: FirSession,
314312
diagnosticsReporter: BaseDiagnosticsCollector
315313
): GenerationState {
316314
val (moduleFragment, components) = fir2IrResult
@@ -342,7 +340,7 @@ object FirKotlinToJvmBytecodeCompiler {
342340
generationState.oldBEInitTrace(ktFiles)
343341
codegenFactory.generateModuleInFrontendIRMode(
344342
generationState, moduleFragment, components.symbolTable, components.irProviders,
345-
extensions, FirJvmBackendExtension(session, components), fir2IrResult.pluginContext
343+
extensions, FirJvmBackendExtension(components), fir2IrResult.pluginContext
346344
) {
347345
performanceManager?.notifyIRLoweringFinished()
348346
performanceManager?.notifyIRGenerationStarted()

‎compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,7 @@ fun convertAnalyzedFirToIr(
228228
input.configuration,
229229
extensions,
230230
irModuleFragment,
231-
components.symbolTable,
232231
components,
233-
analysisResults.platformOutput.session,
234232
pluginContext
235233
)
236234
}
@@ -272,10 +270,10 @@ fun generateCodeFromIr(
272270
codegenFactory.generateModuleInFrontendIRMode(
273271
generationState,
274272
input.irModuleFragment,
275-
input.symbolTable,
273+
input.components.symbolTable,
276274
input.components.irProviders,
277275
input.extensions,
278-
FirJvmBackendExtension(input.firSession, input.components),
276+
FirJvmBackendExtension(input.components),
279277
8000 input.pluginContext
280278
) {
281279
performanceManager?.notifyIRLoweringFinished()

‎compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipelineData.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,11 @@ import org.jetbrains.kotlin.codegen.state.GenerationState
1010
import org.jetbrains.kotlin.config.CompilerConfiguration
1111
import org.jetbrains.kotlin.diagnostics.impl.BaseDiagnosticsCollector
1212
import org.jetbrains.kotlin.fir.FirModuleData
13-
import org.jetbrains.kotlin.fir.FirSession
1413
import org.jetbrains.kotlin.fir.backend.Fir2IrComponents
1514
import org.jetbrains.kotlin.fir.backend.Fir2IrPluginContext
1615
import org.jetbrains.kotlin.fir.backend.jvm.JvmFir2IrExtensions
17-
import org.jetbrains.kotlin.fir.declarations.FirFile
18-
import org.jetbrains.kotlin.fir.resolve.ScopeSession
1916
import org.jetbrains.kotlin.fir.session.environment.AbstractProjectEnvironment
2017
import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
21-
import org.jetbrains.kotlin.ir.util.SymbolTable
2218
import org.jetbrains.kotlin.modules.TargetId
2319
import org.jetbrains.kotlin.platform.TargetPlatform
2420

@@ -48,8 +44,6 @@ data class ModuleCompilerIrBackendInput(
4844
val configuration: CompilerConfiguration,
4945
val extensions: JvmFir2IrExtensions,
5046
val irModuleFragment: IrModuleFragment,
51-
val symbolTable: SymbolTable,
5247
val components: Fir2IrComponents,
53-
val firSession: FirSession,
5448
val pluginContext: Fir2IrPluginContext
5549
)

‎compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmBackendExtension.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,20 @@ import org.jetbrains.kotlin.backend.jvm.JvmBackendExtension
1010
import org.jetbrains.kotlin.backend.jvm.metadata.MetadataSerializer
1111
import org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings
1212
import org.jetbrains.kotlin.config.JvmAbiStability
13-
import org.jetbrains.kotlin.fir.FirSession
1413
import org.jetbrains.kotlin.fir.backend.Fir2IrComponents
1514
import org.jetbrains.kotlin.ir.declarations.IrClass
1615
import org.jetbrains.kotlin.load.java.JvmAnnotationNames
1716
import org.jetbrains.org.objectweb.asm.Type
1817

19-
class FirJvmBackendExtension(private val session: FirSession, private val components: Fir2IrComponents) : JvmBackendExtension {
18+
class FirJvmBackendExtension(private val components: Fir2IrComponents) : JvmBackendExtension {
2019
override fun createSerializer(
2120
context: JvmBackendContext,
2221
klass: IrClass,
2322
type: Type,
2423
bindings: JvmSerializationBindings,
2524
parentSerializer: MetadataSerializer?
2625
): MetadataSerializer {
27-
return makeFirMetadataSerializerForIrClass(session, context, klass, bindings, components, parentSerializer)
26+
return makeFirMetadataSerializerForIrClass(components.session, context, klass, bindings, components, parentSerializer)
2827
}
2928

3029
override fun generateMetadataExtraFlags(abiStability: JvmAbiStability?): Int =

‎compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunner.kt

Lines changed: 0 additions & 2 deletions
9E88
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,7 @@ class IncrementalFirJvmCompilerRunner(
284284
configuration,
285285
extensions,
286286
platformIrOutput.irModuleFragment,
287-
platformIrOutput.components.symbolTable,
288287
platformIrOutput.components,
289-
cycleResult.platformOutput.session,
290288
platformIrOutput.pluginContext
291289
)
292290

‎compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class Fir2IrResultsConverter(
103103
phaseConfig,
104104
components.irProviders,
105105
fir2IrExtensions,
106-
FirJvmBackendExtension(firOutputPart.session, components),
106+
FirJvmBackendExtension(components),
107107
pluginContext,
108108
notifyCodegenStart = {},
109109
)

‎compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ object GenerationUtils {
160160
generationState.oldBEInitTrace(files)
161161
codegenFactory.generateModuleInFrontendIRMode(
162162
generationState, moduleFragment, components.symbolTable, components.irProviders,
163-
fir2IrExtensions, FirJvmBackendExtension(session, components), pluginContext,
163+
fir2IrExtensions, FirJvmBackendExtension(components), pluginContext,
164164
) {}
165165

166166
generationState.factory.done()

0 commit comments

Comments
 (0)
0