Fix FIR incremental compilation failure with inlines and lambdas

#KT-51546 fixed
This commit is contained in:
Ilya Chernikov
2022-03-05 18:27:25 +01:00
committed by teamcity
parent 8f1a2f4612
commit aa0386276d
13 changed files with 134 additions and 12 deletions
@@ -923,6 +923,11 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem
runTest("jps/jps-plugin/testData/incremental/inlineFunCallSite/function/");
}
@TestMetadata("functionIndirect")
public void testFunctionIndirect() throws Exception {
runTest("jps/jps-plugin/testData/incremental/inlineFunCallSite/functionIndirect/");
}
@TestMetadata("getter")
public void testGetter() throws Exception {
runTest("jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/");
@@ -1025,6 +1030,19 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/functionIndirect")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class FunctionIndirect extends AbstractIncrementalFirJvmCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
}
public void testAllFilesPresentInFunctionIndirect() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/inlineFunCallSite/functionIndirect"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/getter")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
@@ -923,6 +923,11 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement
runTest("jps/jps-plugin/testData/incremental/inlineFunCallSite/function/");
}
@TestMetadata("functionIndirect")
public void testFunctionIndirect() throws Exception {
runTest("jps/jps-plugin/testData/incremental/inlineFunCallSite/functionIndirect/");
}
@TestMetadata("getter")
public void testGetter() throws Exception {
runTest("jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/");
@@ -1025,6 +1030,19 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/functionIndirect")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class FunctionIndirect extends AbstractIncrementalJvmCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
}
public void testAllFilesPresentInFunctionIndirect() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/inlineFunCallSite/functionIndirect"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/getter")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
@@ -923,6 +923,11 @@ public class IncrementalJvmOldBackendCompilerRunnerTestGenerated extends Abstrac
runTest("jps/jps-plugin/testData/incremental/inlineFunCallSite/function/");
}
@TestMetadata("functionIndirect")
public void testFunctionIndirect() throws Exception {
runTest("jps/jps-plugin/testData/incremental/inlineFunCallSite/functionIndirect/");
}
@TestMetadata("getter")
public void testGetter() throws Exception {
runTest("jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/");
@@ -1025,6 +1030,19 @@ public class IncrementalJvmOldBackendCompilerRunnerTestGenerated extends Abstrac
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/functionIndirect")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class FunctionIndirect extends AbstractIncrementalJvmOldBackendCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
}
public void testAllFilesPresentInFunctionIndirect() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/inlineFunCallSite/functionIndirect"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM, true);
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/getter")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)