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

JVM: update test data after enabling IR fake override builder

Browse Source 
#KT-61514 Fixed
This commit is contained in:
Alexander Udalov
2024-01-09 16:08:15 +01:00
committed by Space Team
parent f98a22e8e4
commit dfd9aabf8e
83 changed files with 244 additions and 1006 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/fir/CustomHashSetSize.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// TARGET_BACKEND: JVM_IR
// IGNORE_BACKEND_K2: JVM_IR
// IGNORE_CODEGEN_WITH_FIR2IR_FAKE_OVERRIDE_GENERATION: JVM_IR
// ISSUE: KT-61941
// WITH_STDLIB
compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt
Vendored
-21
View File
@@ -1,21 +0,0 @@
// 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
@@ -1,53 +0,0 @@
// 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"
}