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

Basic infrastructure for psi2ir tests with JS front-end

Browse Source
This commit is contained in:
Dmitry Petrov
2018-10-17 14:15:10 +03:00
parent 01091ba1aa
commit ad9953724f
6 changed files with 154 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/ir/irJsText/dynamic/invokeOperator.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
fun test1(a: dynamic) = a(1)
fun test1a(a: dynamic) = a.invoke(1)
fun test2(a: dynamic, b: dynamic) = a(b)
fun test2a(a: dynamic, b: dynamic) = a.invoke(b)
fun test2b(a: dynamic, b: dynamic) = a(b)(b)
compiler/testData/ir/irJsText/dynamic/invokeOperator.txt
Vendored
+41
View File
@@ -0,0 +1,41 @@
FILE fqName:<root> fileName:/invokeOperator.kt
FUN name:test1 visibility:public modality:FINAL <> (a:dynamic) returnType:dynamic flags:
VALUE_PARAMETER name:a index:0 type:dynamic flags:
BLOCK_BODY
RETURN type=kotlin.Nothing from='test1(dynamic): dynamic'
CALL 'invoke(dynamic): dynamic' type=dynamic origin=INVOKE
$this: GET_VAR 'value-parameter a: dynamic' type=dynamic origin=VARIABLE_AS_FUNCTION
p0: CONST Int type=kotlin.Int value=1
FUN name:test1a visibility:public modality:FINAL <> (a:dynamic) returnType:dynamic flags:
VALUE_PARAMETER name:a index:0 type:dynamic flags:
BLOCK_BODY
RETURN type=kotlin.Nothing from='test1a(dynamic): dynamic'
CALL 'invoke(dynamic): dynamic' type=dynamic origin=null
$this: GET_VAR 'value-parameter a: dynamic' type=dynamic origin=null
p0: CONST Int type=kotlin.Int value=1
FUN name:test2 visibility:public modality:FINAL <> (a:dynamic, b:dynamic) returnType:dynamic flags:
VALUE_PARAMETER name:a index:0 type:dynamic flags:
VALUE_PARAMETER name:b index:1 type:dynamic flags:
BLOCK_BODY
RETURN type=kotlin.Nothing from='test2(dynamic, dynamic): dynamic'
CALL 'invoke(dynamic): dynamic' type=dynamic origin=INVOKE
$this: GET_VAR 'value-parameter a: dynamic' type=dynamic origin=VARIABLE_AS_FUNCTION
p0: GET_VAR 'value-parameter b: dynamic' type=dynamic origin=null
FUN name:test2a visibility:public modality:FINAL <> (a:dynamic, b:dynamic) returnType:dynamic flags:
VALUE_PARAMETER name:a index:0 type:dynamic flags:
VALUE_PARAMETER name:b index:1 type:dynamic flags:
BLOCK_BODY
RETURN type=kotlin.Nothing from='test2a(dynamic, dynamic): dynamic'
CALL 'invoke(dynamic): dynamic' type=dynamic origin=null
$this: GET_VAR 'value-parameter a: dynamic' type=dynamic origin=null
p0: GET_VAR 'value-parameter b: dynamic' type=dynamic origin=null
FUN name:test2b visibility:public modality:FINAL <> (a:dynamic, b:dynamic) returnType:dynamic flags:
VALUE_PARAMETER name:a index:0 type:dynamic flags:
VALUE_PARAMETER name:b index:1 type:dynamic flags:
BLOCK_BODY
RETURN type=kotlin.Nothing from='test2b(dynamic, dynamic): dynamic'
CALL 'invoke(dynamic): dynamic' type=dynamic origin=null
$this: CALL 'invoke(dynamic): dynamic' type=dynamic origin=INVOKE
$this: GET_VAR 'value-parameter a: dynamic' type=dynamic origin=VARIABLE_AS_FUNCTION
p0: GET_VAR 'value-parameter b: dynamic' type=dynamic origin=null
p0: GET_VAR 'value-parameter b: dynamic' type=dynamic origin=null
compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt
+36 -5
View File
@@ -17,6 +17,7 @@
package org.jetbrains.kotlin.ir
import junit.framework.TestCase
import org.jetbrains.kotlin.analyzer.AnalysisResult
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.codegen.CodegenTestCase
@@ -25,6 +26,7 @@ import org.jetbrains.kotlin.config.languageVersionSettings
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.ir.declarations.IrFile
import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi2ir.Psi2IrConfiguration
import org.jetbrains.kotlin.psi2ir.Psi2IrTranslator
@@ -90,14 +92,18 @@ abstract class AbstractIrGeneratorTestCase : CodegenTestCase() {
protected fun generateIrModule(ignoreErrors: Boolean = false, shouldGenerate: (KtFile) -> Boolean = { true }): IrModuleFragment {
assert(myFiles != null) { "myFiles not initialized" }
assert(myEnvironment != null) { "myEnvironment not initialized" }
return generateIrModule(
myFiles.psiFiles,
myEnvironment,
return doGenerateIrModule(
Psi2IrTranslator(myEnvironment.configuration.languageVersionSettings, Psi2IrConfiguration(ignoreErrors)),
shouldGenerate
)
}
protected open fun doGenerateIrModule(
psi2IrTranslator: Psi2IrTranslator,
shouldGenerate: (KtFile) -> Boolean
): IrModuleFragment =
generateIrModuleWithJvmResolve(myFiles.psiFiles, myEnvironment, psi2IrTranslator, shouldGenerate)
protected fun generateIrFilesAsSingleModule(testFiles: List<TestFile>, ignoreErrors: Boolean = false): Map<TestFile, IrFile> {
val irModule = generateIrModule(ignoreErrors)
val ktFiles = testFiles.filter { it.name.endsWith(".kt") }
@@ -121,13 +127,38 @@ abstract class AbstractIrGeneratorTestCase : CodegenTestCase() {
return textFile
}
fun generateIrModule(
fun generateIrModuleWithJsResolve(
ktFilesToAnalyze: List<KtFile>,
environment: KotlinCoreEnvironment,
psi2ir: Psi2IrTranslator,
shouldGenerate: (KtFile) -> Boolean
): IrModuleFragment =
generateIrModule(
TopDownAnalyzerFacadeForJS.analyzeFiles(
ktFilesToAnalyze, environment.project, environment.configuration,
moduleDescriptors = emptyList(),
friendModuleDescriptors = emptyList()
),
psi2ir, ktFilesToAnalyze, shouldGenerate
)
fun generateIrModuleWithJvmResolve(
ktFilesToAnalyze: List<KtFile>,
environment: KotlinCoreEnvironment,
psi2ir: Psi2IrTranslator,
shouldGenerate: (KtFile) -> Boolean
): IrModuleFragment =
generateIrModule(
JvmResolveUtil.analyze(ktFilesToAnalyze, environment),
psi2ir, ktFilesToAnalyze, shouldGenerate
)
private fun generateIrModule(
analysisResult: AnalysisResult,
psi2ir: Psi2IrTranslator,
ktFilesToAnalyze: List<KtFile>,
shouldGenerate: (KtFile) -> Boolean
): IrModuleFragment {
val analysisResult = JvmResolveUtil.analyze(ktFilesToAnalyze, environment)
if (!psi2ir.configuration.ignoreErrors) {
analysisResult.throwIfError()
AnalyzingUtils.throwExceptionOnErrors(analysisResult.bindingContext)
compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrJsTextTestCase.kt
+18
View File
@@ -0,0 +1,18 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.ir
import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi2ir.Psi2IrTranslator
abstract class AbstractIrJsTextTestCase : AbstractIrTextTestCase() {
override fun doGenerateIrModule(
psi2IrTranslator: Psi2IrTranslator,
shouldGenerate: (KtFile) -> Boolean
): IrModuleFragment =
generateIrModuleWithJsResolve(myFiles.psiFiles, myEnvironment, psi2IrTranslator, shouldGenerate)
}
compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
+5
View File
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.generators.tests.generator.testGroup
import org.jetbrains.kotlin.generators.util.KT_OR_KTS_WITHOUT_DOTS_IN_NAME
import org.jetbrains.kotlin.integration.AbstractAntTaskTest
import org.jetbrains.kotlin.ir.AbstractIrCfgTestCase
import org.jetbrains.kotlin.ir.AbstractIrJsTextTestCase
import org.jetbrains.kotlin.ir.AbstractIrSourceRangesTestCase
import org.jetbrains.kotlin.ir.AbstractIrTextTestCase
import org.jetbrains.kotlin.jvm.compiler.*
@@ -184,6 +185,10 @@ fun main(args: Array<String>) {
model("ir/irText")
}
testClass<AbstractIrJsTextTestCase> {
model("ir/irJsText")
}
testClass<AbstractIrCfgTestCase> {
model("ir/irCfg")
}
compiler/tests/org/jetbrains/kotlin/ir/IrJsTextTestCaseGenerated.java
Generated
+49
View File
@@ -0,0 +1,49 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.ir;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.TargetBackend;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.runner.RunWith;
import java.io.File;
import java.util.regex.Pattern;
/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/ir/irJsText")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public class IrJsTextTestCaseGenerated extends AbstractIrJsTextTestCase {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
}
public void testAllFilesPresentInIrJsText() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/ir/irJsText"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
}
@TestMetadata("compiler/testData/ir/irJsText/dynamic")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Dynamic extends AbstractIrJsTextTestCase {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
}
public void testAllFilesPresentInDynamic() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/ir/irJsText/dynamic"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
}
@TestMetadata("invokeOperator.kt")
public void testInvokeOperator() throws Exception {
runTest("compiler/testData/ir/irJsText/dynamic/invokeOperator.kt");
}
}
}