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/builtinStubMethods/mapRemove/noDefaultImpls.jvm_abi.txt
Vendored
-35
View File
@@ -1,35 +0,0 @@
MODULE main
CLASS B.class
K1
getOrDefault(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String; [public, final, bridge]
K2
---
K1
getOrDefault(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; [public, bridge]
K2
---
K1
remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public, final, bridge]
K2
---
K1
remove(Ljava/lang/String;Ljava/lang/String;)Z [public, bridge]
K2
---
CLASS D.class
K1
getOrDefault(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String; [public, final, bridge]
K2
---
K1
getOrDefault(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; [public, bridge]
K2
---
K1
remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public, final, bridge]
K2
---
K1
remove(Ljava/lang/String;Ljava/lang/String;)Z [public, bridge]
K2
---
compiler/testData/codegen/box/builtinStubMethods/mapRemove/noDefaultImpls.kt
Vendored
-1
View File
@@ -4,7 +4,6 @@
// JVM_TARGET: 1.8
// WITH_STDLIB
// FULL_JDK
// JVM_ABI_K1_K2_DIFF: KT-57301
// There should be no DefaultImpls method for MutableMap.remove(K;V)
interface A<K, V> : MutableMap<K, V>
compiler/testData/codegen/box/collections/kt48945.jvm_abi.txt
Vendored
-10
View File
@@ -1,10 +0,0 @@
MODULE main
CLASS Test.class
K1
getOrDefault(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String; [public, final, bridge]
K2
---
K1
getOrDefault(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; [public, bridge]
K2
---
compiler/testData/codegen/box/collections/kt48945.kt
Vendored
-1
View File
@@ -3,7 +3,6 @@
// IGNORE_BACKEND: ANDROID
// ^ NSME: java.util.AbstractMap.remove
// FULL_JDK
// JVM_ABI_K1_K2_DIFF: KT-65095
class Test : Map<String, String>, java.util.AbstractMap<String, String>() {
override val entries: MutableSet<MutableMap.MutableEntry<String, String>>
compiler/testData/codegen/box/collections/kt48945a.jvm_abi.txt
Vendored
-10
View File
@@ -1,10 +0,0 @@
MODULE main
CLASS Test.class
K1
getOrDefault(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String; [public, final, bridge]
K2
---
K1
getOrDefault(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; [public, bridge]
K2
---
compiler/testData/codegen/box/collections/kt48945a.kt
Vendored
-1
View File
@@ -3,7 +3,6 @@
// IGNORE_BACKEND: ANDROID
// ^ NSME: java.util.AbstractMap.remove
// FULL_JDK
// JVM_ABI_K1_K2_DIFF: KT-65095
interface MSS : Map<String, String>
compiler/testData/codegen/box/collections/kt48945b.jvm_abi.txt
Vendored
-10
View File
@@ -1,10 +0,0 @@
MODULE main
CLASS Test.class
K1
getOrDefault(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String; [public, final, bridge]
K2
---
K1
getOrDefault(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; [public, bridge]
K2
---
compiler/testData/codegen/box/collections/kt48945b.kt
Vendored
-1
View File
@@ -3,7 +3,6 @@
// IGNORE_BACKEND: ANDROID
// ^ NSME: java.util.AbstractMap.remove
// FULL_JDK
// JVM_ABI_K1_K2_DIFF: KT-65095
// FILE: kt48945b.kt
interface MSS : Map<String, String>
compiler/testData/codegen/box/collections/kt48945c.jvm_abi.txt
Vendored
-10
View File
@@ -1,10 +0,0 @@
MODULE main
CLASS Test.class
K1
getOrDefault(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String; [public, final, bridge]
K2
---
K1
getOrDefault(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; [public, bridge]
K2
---
compiler/testData/codegen/box/collections/kt48945c.kt
Vendored
-1
View File
@@ -3,7 +3,6 @@
// IGNORE_BACKEND: ANDROID
// ^ NSME: java.util.AbstractMap.remove
// FULL_JDK
// JVM_ABI_K1_K2_DIFF: KT-65095
// FILE: kt48945b.kt
interface MSS : Map<String, String>
compiler/testData/codegen/box/compileKotlinAgainstKotlin/clashingFakeOverrideSignatures.kt
Vendored
+3 -2
View File
@@ -1,7 +1,8 @@
// IGNORE_BACKEND_K2: JS_IR
// IGNORE_BACKEND: NATIVE
// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION
// Reason: KT-42020
// IGNORE_BACKEND_K2: JVM_IR
// FIR status: KT-65504 IrFakeOverrideBuilder: incorrect runtime behavior in case a substitution fake override clashes with another fake override
// MODULE: lib
// FILE: a.kt
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"
}
compiler/testData/codegen/box/inference/overrideGenericDefaultMethod.jvm_abi.txt
Vendored
-10
View File
@@ -1,10 +0,0 @@
MODULE main
CLASS MyFinalClassI.class
K1
---
K2
test(I)Ljava/lang/Integer; [public]
K1
---
K2
testWithDefault(Ljava/lang/Integer;)Ljava/lang/Integer; [public]
compiler/testData/codegen/box/inference/overrideGenericDefaultMethod.kt
Vendored
-2
View File
@@ -1,5 +1,3 @@
// JVM_ABI_K1_K2_DIFF: KT-62781
// MODULE: InterfaceModule
// FILE: MyInterface.kt
interface MyInterface<T> {
compiler/testData/codegen/box/ir/clashingFakeOverrideSignatures.kt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
// TARGET_BACKEND: JVM
// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION
// Reason: KT-42020
// IGNORE_BACKEND_K2: JVM_IR
// FIR status: KT-65504 IrFakeOverrideBuilder: incorrect runtime behavior in case a substitution fake override clashes with another fake override
open class Base<T> {
fun foo(x: T) = "x:$x"
compiler/testData/codegen/box/jvm8/kt14243_2.jvm_abi.txt
Vendored
-6
View File
@@ -1,6 +0,0 @@
MODULE main
CLASS ZImpl2.class
K1
---
K2
test(Ljava/lang/String;)Ljava/lang/String; [public]
compiler/testData/codegen/box/jvm8/kt14243_2.kt
Vendored
+1 -3
View File
@@ -1,5 +1,3 @@
// JVM_ABI_K1_K2_DIFF: KT-62781
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
@@ -22,4 +20,4 @@ class ZImpl3 : ZImpl2() {
fun box(): String {
return ZImpl3().test("OK")
}
}
compiler/testData/codegen/box/jvm8/kt33054.jvm_abi.txt
Vendored
-45
View File
@@ -1,45 +0,0 @@
MODULE main
CLASS Kt33054Kt.class
Annotation: class.invisibleAnnotations
K1
@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
kt33054.kt
Kotlin
*S Kotlin
*F
+ 1 kt33054.kt
Kt33054Kt
+ 2 kt33054.kt
A
*L
1#1,20:1
6#2,4:21
*S KotlinDebug
*F
+ 1 kt33054.kt
Kt33054Kt
*L
19#1:21,4
*E
} )
K2
@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
kt33054.kt
Kotlin
*S Kotlin
*F
+ 1 kt33054.kt
Kt33054Kt
+ 2 kt33054.kt
A
*L
1#1,20:1
6#2:21
*S KotlinDebug
*F
+ 1 kt33054.kt
Kt33054Kt
*L
19#1:21
*E
} )
compiler/testData/codegen/box/jvm8/kt33054.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
// JVM_ABI_K1_K2_DIFF: KT-62464
open class A(val x: String) {
inline fun f() = if (this is C) this else A("O")
compiler/testData/codegen/box/super/kt14243_2.jvm_abi.txt
Vendored
-6
View File
@@ -1,6 +0,0 @@
MODULE main
CLASS ZImpl2.class
K1
---
K2
test(Ljava/lang/String;)Ljava/lang/String; [public]
compiler/testData/codegen/box/super/kt14243_2.kt
Vendored
+1 -3
View File
@@ -1,5 +1,3 @@
// JVM_ABI_K1_K2_DIFF: KT-62781
interface Z<T> {
fun test(p: T): T {
return p
@@ -19,4 +17,4 @@ class ZImpl3 : ZImpl2() {
fun box(): String {
return ZImpl3().test("OK")
}
}
compiler/testData/codegen/boxInline/property/fromObject.jvm_abi.txt
Vendored
-34
View File
@@ -1,34 +0,0 @@
MODULE main
CLASS _2Kt.class
Annotation: class.invisibleAnnotations
K1
@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
2.kt
Kotlin
*S Kotlin
*F
+ 1 2.kt
_2Kt
+ 2 1.kt
test/A
+ 3 fake.kt
kotlin/jvm/internal/FakeKt
*L
1#1,29:1
12#2:30
13#2:32
10#2:33
1#3:31
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
25#1:30
25#1:32
27#1:33
25#1:31
*E
} )
K2
---
compiler/testData/codegen/boxInline/property/fromObject.kt
Vendored
-2
View File
@@ -1,6 +1,4 @@
// WITH_STDLIB
// JVM_ABI_K1_K2_DIFF: KT-66000
// FILE: 1.kt
package test
compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordWithCompanion.fir.ir.txt
Vendored
+3 -3
View File
@@ -56,7 +56,7 @@ FILE fqName:<root> fileName:/recordWithCompanion.kt
id: GET_VAR 'id: kotlin.String declared in <root>.Tag.copy' type=kotlin.String origin=null
FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Tag, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
overridden:
public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
public abstract fun equals (p0: @[EnhancedNullability] kotlin.Any?): kotlin.Boolean declared in java.lang.Record
$this: VALUE_PARAMETER name:<this> type:<root>.Tag
VALUE_PARAMETER name:other index:0 type:kotlin.Any?
BLOCK_BODY
@@ -90,7 +90,7 @@ FILE fqName:<root> fileName:/recordWithCompanion.kt
CONST Boolean type=kotlin.Boolean value=true
FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Tag) returnType:kotlin.Int
overridden:
public open fun hashCode (): kotlin.Int declared in kotlin.Any
public abstract fun hashCode (): kotlin.Int declared in java.lang.Record
$this: VALUE_PARAMETER name:<this> type:<root>.Tag
BLOCK_BODY
RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Tag'
@@ -99,7 +99,7 @@ FILE fqName:<root> fileName:/recordWithCompanion.kt
receiver: GET_VAR '<this>: <root>.Tag declared in <root>.Tag.hashCode' type=<root>.Tag origin=null
FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Tag) returnType:kotlin.String
overridden:
public open fun toString (): kotlin.String declared in kotlin.Any
public abstract fun toString (): @[EnhancedNullability] kotlin.String declared in java.lang.Record
$this: VALUE_PARAMETER name:<this> type:<root>.Tag
BLOCK_BODY
RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Tag'
compiler/testData/codegen/bytecodeListing/specialBridges/kt48945.kt
Vendored
-3
View File
@@ -1,9 +1,6 @@
// TARGET_BACKEND: JVM
// FULL_JDK
// IGNORE_BACKEND_K2: JVM_IR
// FIR status: KT-57301 K2: `getOrDefault` and bridges are not generated for certain Map subclasses
// FILE: kt48945.kt
interface MSS : Map<String, String>
interface GM<K, V> : Map<K, V>