From e4473ad94c2d0b3805d7cad17c7add70c7240fc7 Mon Sep 17 00:00:00 2001 From: Nikolay Lunyak Date: Thu, 26 Aug 2021 17:58:44 +0300 Subject: [PATCH] [FIR2IR] Add Fir2IrSpecificBytecodeListing tests support --- .../codegen/AbstractBytecodeListingTest.kt | 16 ++++++++++++++++ .../generators/GenerateJUnit5CompilerTests.kt | 6 ++++++ 2 files changed, 22 insertions(+) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeListingTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeListingTest.kt index 023cade4255..c6ab2fed6e1 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeListingTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeListingTest.kt @@ -18,6 +18,9 @@ import org.jetbrains.kotlin.test.builders.configureJvmArtifactsHandlersStep import org.jetbrains.kotlin.test.directives.CodegenTestDirectives import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerWithTargetBackendTest import org.jetbrains.kotlin.test.frontend.classic.* +import org.jetbrains.kotlin.test.frontend.fir.Fir2IrResultsConverter +import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade +import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifact import org.jetbrains.kotlin.test.model.* abstract class AbstractBytecodeListingTestBase, I : ResultingArtifact.BackendInput>( @@ -69,3 +72,16 @@ open class AbstractIrBytecodeListingTest : AbstractBytecodeListingTestBase> get() = ::JvmIrBackendFacade } + +open class AbstractFirBytecodeListingTest : AbstractBytecodeListingTestBase( + TargetBackend.JVM_IR, FrontendKinds.FIR +) { + override val frontendFacade: Constructor> + get() = ::FirFrontendFacade + + override val frontendToBackendConverter: Constructor> + get() = ::Fir2IrResultsConverter + + override val backendFacade: Constructor> + get() = ::JvmIrBackendFacade +} diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt index e834651e10c..3c40b217761 100644 --- a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt +++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt @@ -210,6 +210,12 @@ fun generateJUnit5CompilerTests(args: Array) { ) { model("ir/irText") } + + testClass( + suiteTestClassName = "Fir2IrSpecificBytecodeListingTestGenerated" + ) { + model("codegen/bytecodeListing") + } } testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/fir/analysis-tests/testData") {