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

FIR: fix use-site file in supertypes resolution

Browse Source 
manifested in the IC tests by a seemingly redundant lookup,
although theoretically may lead to more severe issues.
Also fixes lookup recording ignoring logic, since the old
one may break with the new us-site file calculation.
#KT-55195 fixed
This commit is contained in:
Ilya Chernikov
2023-01-24 12:29:03 +01:00
committed by Space Team
parent dcbcc8b684
commit 62f2a09d70
7 changed files with 49 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/GenerateJpsPluginTests.kt
+3 -3
View File
@@ -57,19 +57,19 @@ fun main(args: Array<String>) {
testClass<AbstractIncrementalK2JvmJpsTest>(
init = incrementalJvmTestData(
TargetBackend.JVM_IR,
excludePattern = "(^.*Expect.*)|(^classMovedIntoOtherClass)|(^companionConstantChanged)"
excludePattern = "(^.*Expect.*)"
)
)
testClass<AbstractIncrementalK2LightTreeJvmJpsTest>(
init = incrementalJvmTestData(
TargetBackend.JVM_IR,
excludePattern = "(^.*Expect.*)|(^classMovedIntoOtherClass)|(^companionConstantChanged)"
excludePattern = "(^.*Expect.*)"
)
)
testClass<AbstractIncrementalK2FirICLightTreeJvmJpsTest>(
init = incrementalJvmTestData(
TargetBackend.JVM_IR,
excludePattern = "(^.*Expect.*)|(^classMovedIntoOtherClass)|(^companionConstantChanged)"
excludePattern = "(^.*Expect.*)"
)
)
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalK2FirICLightTreeJvmJpsTestGenerated.java
Generated
+12 -2
View File
@@ -64,7 +64,7 @@ public class IncrementalK2FirICLightTreeJvmJpsTestGenerated extends AbstractIncr
}
public void testAllFilesPresentInPureKotlin() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("(^.*Expect.*)|(^classMovedIntoOtherClass)|(^companionConstantChanged)"), TargetBackend.JVM_IR, false);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("(^.*Expect.*)"), TargetBackend.JVM_IR, false);
}
@TestMetadata("annotations")
@@ -117,6 +117,11 @@ public class IncrementalK2FirICLightTreeJvmJpsTestGenerated extends AbstractIncr
runTest("jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/");
}
@TestMetadata("companionConstantChanged")
public void testCompanionConstantChanged() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/");
}
@TestMetadata("compilationErrorThenFixedOtherPackage")
public void testCompilationErrorThenFixedOtherPackage() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/");
@@ -692,7 +697,7 @@ public class IncrementalK2FirICLightTreeJvmJpsTestGenerated extends AbstractIncr
}
public void testAllFilesPresentInClassHierarchyAffected() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/classHierarchyAffected"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("(^.*Expect.*)|(^classMovedIntoOtherClass)|(^companionConstantChanged)"), TargetBackend.JVM_IR, false);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/classHierarchyAffected"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("(^.*Expect.*)"), TargetBackend.JVM_IR, false);
}
@TestMetadata("annotationFlagRemoved")
@@ -725,6 +730,11 @@ public class IncrementalK2FirICLightTreeJvmJpsTestGenerated extends AbstractIncr
runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/");
}
@TestMetadata("classMovedIntoOtherClass")
public void testClassMovedIntoOtherClass() throws Exception {
runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/");
}
@TestMetadata("classRemoved")
public void testClassRemoved() throws Exception {
runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/");
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalK2JvmJpsTestGenerated.java
Generated
+12 -2
View File
@@ -64,7 +64,7 @@ public class IncrementalK2JvmJpsTestGenerated extends AbstractIncrementalK2JvmJp
}
public void testAllFilesPresentInPureKotlin() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("(^.*Expect.*)|(^classMovedIntoOtherClass)|(^companionConstantChanged)"), TargetBackend.JVM_IR, false);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("(^.*Expect.*)"), TargetBackend.JVM_IR, false);
}
@TestMetadata("annotations")
@@ -117,6 +117,11 @@ public class IncrementalK2JvmJpsTestGenerated extends AbstractIncrementalK2JvmJp
runTest("jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/");
}
@TestMetadata("companionConstantChanged")
public void testCompanionConstantChanged() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/");
}
@TestMetadata("compilationErrorThenFixedOtherPackage")
public void testCompilationErrorThenFixedOtherPackage() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/");
@@ -692,7 +697,7 @@ public class IncrementalK2JvmJpsTestGenerated extends AbstractIncrementalK2JvmJp
}
public void testAllFilesPresentInClassHierarchyAffected() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/classHierarchyAffected"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("(^.*Expect.*)|(^classMovedIntoOtherClass)|(^companionConstantChanged)"), TargetBackend.JVM_IR, false);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/classHierarchyAffected"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("(^.*Expect.*)"), TargetBackend.JVM_IR, false);
}
@TestMetadata("annotationFlagRemoved")
@@ -725,6 +730,11 @@ public class IncrementalK2JvmJpsTestGenerated extends AbstractIncrementalK2JvmJp
runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/");
}
@TestMetadata("classMovedIntoOtherClass")
public void testClassMovedIntoOtherClass() throws Exception {
runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/");
}
@TestMetadata("classRemoved")
public void testClassRemoved() throws Exception {
runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/");
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalK2LightTreeJvmJpsTestGenerated.java
Generated
+12 -2
View File
@@ -64,7 +64,7 @@ public class IncrementalK2LightTreeJvmJpsTestGenerated extends AbstractIncrement
}
public void testAllFilesPresentInPureKotlin() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("(^.*Expect.*)|(^classMovedIntoOtherClass)|(^companionConstantChanged)"), TargetBackend.JVM_IR, false);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("(^.*Expect.*)"), TargetBackend.JVM_IR, false);
}
@TestMetadata("annotations")
@@ -117,6 +117,11 @@ public class IncrementalK2LightTreeJvmJpsTestGenerated extends AbstractIncrement
runTest("jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/");
}
@TestMetadata("companionConstantChanged")
public void testCompanionConstantChanged() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/");
}
@TestMetadata("compilationErrorThenFixedOtherPackage")
public void testCompilationErrorThenFixedOtherPackage() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/");
@@ -692,7 +697,7 @@ public class IncrementalK2LightTreeJvmJpsTestGenerated extends AbstractIncrement
}
public void testAllFilesPresentInClassHierarchyAffected() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/classHierarchyAffected"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("(^.*Expect.*)|(^classMovedIntoOtherClass)|(^companionConstantChanged)"), TargetBackend.JVM_IR, false);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/classHierarchyAffected"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("(^.*Expect.*)"), TargetBackend.JVM_IR, false);
}
@TestMetadata("annotationFlagRemoved")
@@ -725,6 +730,11 @@ public class IncrementalK2LightTreeJvmJpsTestGenerated extends AbstractIncrement
runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/");
}
@TestMetadata("classMovedIntoOtherClass")
public void testClassMovedIntoOtherClass() throws Exception {
runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/");
}
@TestMetadata("classRemoved")
public void testClassRemoved() throws Exception {
runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/");