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

K2: add BB tests for KT-59380 working properly (compiler error in K1)

Browse Source 
#KT-59380 As Designed
This commit is contained in:
Mikhail Glukhikh
2024-01-31 10:11:03 +01:00
committed by Space Team
parent dab9ac3b1c
commit 36dd9b6818
12 changed files with 252 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java
Generated
+18
View File
@@ -20168,6 +20168,24 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo
runTest("compiler/testData/codegen/box/fir/kotlinJavaKotlin.kt");
}
@Test
@TestMetadata("kotlinJavaStaticAccidentalOverride.kt")
public void testKotlinJavaStaticAccidentalOverride() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt");
}
@Test
@TestMetadata("kotlinJavaStaticAccidentalOverride2.kt")
public void testKotlinJavaStaticAccidentalOverride2() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt");
}
@Test
@TestMetadata("kotlinJavaStaticFromInterfaceAccidentalOverride.kt")
public void testKotlinJavaStaticFromInterfaceAccidentalOverride() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticFromInterfaceAccidentalOverride.kt");
}
@Test
@TestMetadata("kt61856.kt")
public void testKt61856() throws Exception {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java
Generated
+18
View File
@@ -20168,6 +20168,24 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi
runTest("compiler/testData/codegen/box/fir/kotlinJavaKotlin.kt");
}
@Test
@TestMetadata("kotlinJavaStaticAccidentalOverride.kt")
public void testKotlinJavaStaticAccidentalOverride() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt");
}
@Test
@TestMetadata("kotlinJavaStaticAccidentalOverride2.kt")
public void testKotlinJavaStaticAccidentalOverride2() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt");
}
@Test
@TestMetadata("kotlinJavaStaticFromInterfaceAccidentalOverride.kt")
public void testKotlinJavaStaticFromInterfaceAccidentalOverride() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticFromInterfaceAccidentalOverride.kt");
}
@Test
@TestMetadata("kt61856.kt")
public void testKt61856() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
Generated
+18
View File
@@ -19897,6 +19897,24 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
runTest("compiler/testData/codegen/box/fir/kotlinJavaKotlin.kt");
}
@Test
@TestMetadata("kotlinJavaStaticAccidentalOverride.kt")
public void testKotlinJavaStaticAccidentalOverride() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt");
}
@Test
@TestMetadata("kotlinJavaStaticAccidentalOverride2.kt")
public void testKotlinJavaStaticAccidentalOverride2() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt");
}
@Test
@TestMetadata("kotlinJavaStaticFromInterfaceAccidentalOverride.kt")
public void testKotlinJavaStaticFromInterfaceAccidentalOverride() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticFromInterfaceAccidentalOverride.kt");
}
@Test
@TestMetadata("kt61856.kt")
public void testKt61856() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java
Generated
+18
View File
@@ -19897,6 +19897,24 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated
runTest("compiler/testData/codegen/box/fir/kotlinJavaKotlin.kt");
}
@Test
@TestMetadata("kotlinJavaStaticAccidentalOverride.kt")
public void testKotlinJavaStaticAccidentalOverride() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt");
}
@Test
@TestMetadata("kotlinJavaStaticAccidentalOverride2.kt")
public void testKotlinJavaStaticAccidentalOverride2() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt");
}
@Test
@TestMetadata("kotlinJavaStaticFromInterfaceAccidentalOverride.kt")
public void testKotlinJavaStaticFromInterfaceAccidentalOverride() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticFromInterfaceAccidentalOverride.kt");
}
@Test
@TestMetadata("kt61856.kt")
public void testKt61856() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+18
View File
@@ -19897,6 +19897,24 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
runTest("compiler/testData/codegen/box/fir/kotlinJavaKotlin.kt");
}
@Test
@TestMetadata("kotlinJavaStaticAccidentalOverride.kt")
public void testKotlinJavaStaticAccidentalOverride() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt");
}
@Test
@TestMetadata("kotlinJavaStaticAccidentalOverride2.kt")
public void testKotlinJavaStaticAccidentalOverride2() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt");
}
@Test
@TestMetadata("kotlinJavaStaticFromInterfaceAccidentalOverride.kt")
public void testKotlinJavaStaticFromInterfaceAccidentalOverride() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticFromInterfaceAccidentalOverride.kt");
}
@Test
@TestMetadata("kt61856.kt")
public void testKt61856() throws Exception {
compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt
Vendored
+21
View File
@@ -0,0 +1,21 @@
// TARGET_BACKEND: JVM_IR
// IGNORE_BACKEND_K1: JVM_IR
// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION
// Both K1 and K2 with IR f/o generator report ACCIDENTAL_OVERRIDE on B.foo (see also KT-60283)
// ISSUE: KT-59380
// FILE: A.java
public class A {
public static String foo() {
return "FAIL";
}
}
// FILE: box.kt
class B : A() {
fun foo() = "OK"
}
fun box() = B().foo()
compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt
Vendored
+53
View File
@@ -0,0 +1,53 @@
// TARGET_BACKEND: JVM_IR
// IGNORE_BACKEND_K1: JVM_IR
// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION
// Both K1 and K2 with IR f/o generator report ACCIDENTAL_OVERRIDE on B.foo (see also KT-60283)
// ISSUE: KT-59830
// FILE: A.java
public class A {
public static void foo() {}
public static void baz(String s) {}
}
// FILE: B.kt
open class B : A() {
}
// FILE: C.java
public class C extends B {
public static void bar(int i) {}
}
// FILE: K.kt
open class K : C() {
fun foo() {}
fun foo(a: Any) {}
fun bar(i: Int) {}
fun bar(i: String) {}
fun baz(i: Int) {}
companion object {
fun foo() {}
fun bar(i: Int) {}
}
}
fun box(): String {
A.foo()
A.baz("")
C.bar(0)
K.foo()
K.bar(0)
val k = K()
k.foo()
k.foo(0.0)
k.bar(0)
k.bar("")
k.baz(0)
return "OK"
}
compiler/testData/codegen/box/fir/kotlinJavaStaticFromInterfaceAccidentalOverride.kt
Vendored
+19
View File
@@ -0,0 +1,19 @@
// TARGET_BACKEND: JVM_IR
// JVM_TARGET: 1.8
// ISSUE: KT-59380
// FILE: A.java
public interface A {
static String foo() {
return "FAIL";
}
}
// FILE: box.kt
class B : A {
fun foo() = "OK"
}
fun box() = B().foo()
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java
Generated
+18
View File
@@ -19897,6 +19897,24 @@ public class JvmAbiConsistencyTestBoxGenerated extends AbstractJvmAbiConsistency
runTest("compiler/testData/codegen/box/fir/kotlinJavaKotlin.kt");
}
@Test
@TestMetadata("kotlinJavaStaticAccidentalOverride.kt")
public void testKotlinJavaStaticAccidentalOverride() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt");
}
@Test
@TestMetadata("kotlinJavaStaticAccidentalOverride2.kt")
public void testKotlinJavaStaticAccidentalOverride2() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt");
}
@Test
@TestMetadata("kotlinJavaStaticFromInterfaceAccidentalOverride.kt")
public void testKotlinJavaStaticFromInterfaceAccidentalOverride() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticFromInterfaceAccidentalOverride.kt");
}
@Test
@TestMetadata("kt61856.kt")
public void testKt61856() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+18
View File
@@ -19897,6 +19897,24 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/fir/kotlinJavaKotlin.kt");
}
@Test
@TestMetadata("kotlinJavaStaticAccidentalOverride.kt")
public void testKotlinJavaStaticAccidentalOverride() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt");
}
@Test
@TestMetadata("kotlinJavaStaticAccidentalOverride2.kt")
public void testKotlinJavaStaticAccidentalOverride2() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt");
}
@Test
@TestMetadata("kotlinJavaStaticFromInterfaceAccidentalOverride.kt")
public void testKotlinJavaStaticFromInterfaceAccidentalOverride() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticFromInterfaceAccidentalOverride.kt");
}
@Test
@TestMetadata("kt61856.kt")
public void testKt61856() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
Generated
+18
View File
@@ -19897,6 +19897,24 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
runTest("compiler/testData/codegen/box/fir/kotlinJavaKotlin.kt");
}
@Test
@TestMetadata("kotlinJavaStaticAccidentalOverride.kt")
public void testKotlinJavaStaticAccidentalOverride() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt");
}
@Test
@TestMetadata("kotlinJavaStaticAccidentalOverride2.kt")
public void testKotlinJavaStaticAccidentalOverride2() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt");
}
@Test
@TestMetadata("kotlinJavaStaticFromInterfaceAccidentalOverride.kt")
public void testKotlinJavaStaticFromInterfaceAccidentalOverride() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticFromInterfaceAccidentalOverride.kt");
}
@Test
@TestMetadata("kt61856.kt")
public void testKt61856() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+15
View File
@@ -16397,6 +16397,16 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/fir/emptyIntersectionWarning.kt");
}
@TestMetadata("kotlinJavaStaticAccidentalOverride.kt")
public void ignoreKotlinJavaStaticAccidentalOverride() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt");
}
@TestMetadata("kotlinJavaStaticAccidentalOverride2.kt")
public void ignoreKotlinJavaStaticAccidentalOverride2() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt");
}
@TestMetadata("selectingLambdas.kt")
public void ignoreSelectingLambdas() throws Exception {
runTest("compiler/testData/codegen/box/fir/selectingLambdas.kt");
@@ -16630,6 +16640,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/fir/kotlinJavaKotlin.kt");
}
@TestMetadata("kotlinJavaStaticFromInterfaceAccidentalOverride.kt")
public void testKotlinJavaStaticFromInterfaceAccidentalOverride() throws Exception {
runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticFromInterfaceAccidentalOverride.kt");
}
@TestMetadata("kt61856.kt")
public void testKt61856() throws Exception {
runTest("compiler/testData/codegen/box/fir/kt61856.kt");