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

IR text tests: Unmute enum class-related tests

Browse Source 
Making enum class-related tests unmuted requires implementing
a special "compatibility" mode for IR tree dumper to filter out
fake override declarations leaking from java.enum.Enum and
kotlin.Enum (JVM-only) classes.
This commit is contained in:
Dmitriy Dolovov
2023-11-23 15:07:18 +01:00
committed by Space Team
parent fd96ee1d0b
commit 4532f52898
84 changed files with 1165 additions and 2665 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/ir/irText/singletons/enumEntry.fir.ir.txt
Vendored
-24
View File
@@ -43,10 +43,6 @@ FILE fqName:<root> fileName:/enumEntry.kt
overridden:
public open fun toString (): kotlin.String declared in kotlin.Any
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:kotlin.Any [fake_override]
overridden:
protected final fun clone (): kotlin.Any declared in <root>.Z
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>, other:<root>.Z) returnType:kotlin.Int [fake_override,operator]
overridden:
public final fun compareTo (other: <root>.Z): kotlin.Int declared in <root>.Z
@@ -83,14 +79,6 @@ FILE fqName:<root> fileName:/enumEntry.kt
overridden:
public final fun <get-ordinal> (): kotlin.Int declared in <root>.Z
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] <root>.Z?>? [fake_override]
overridden:
public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] <root>.Z?>? declared in <root>.Z
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
FUN FAKE_OVERRIDE name:finalize visibility:protected/*protected and package*/ modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:kotlin.Unit [fake_override]
overridden:
protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in <root>.Z
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
FUN ENUM_CLASS_SPECIAL_MEMBER name:values visibility:public modality:FINAL <> () returnType:kotlin.Array<<root>.Z>
SYNTHETIC_BODY kind=ENUM_VALUES
FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.Z
@@ -100,10 +88,6 @@ FILE fqName:<root> fileName:/enumEntry.kt
FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.Z>
correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
SYNTHETIC_BODY kind=ENUM_ENTRIES
FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:kotlin.Any [fake_override]
overridden:
protected final fun clone (): kotlin.Any declared in kotlin.Enum
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>, other:<root>.Z) returnType:kotlin.Int [fake_override,operator]
overridden:
public final fun compareTo (other: E of kotlin.Enum): kotlin.Int declared in kotlin.Enum
@@ -140,11 +124,3 @@ FILE fqName:<root> fileName:/enumEntry.kt
overridden:
public final fun <get-ordinal> (): kotlin.Int declared in kotlin.Enum
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] <root>.Z?>? [fake_override]
overridden:
public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
FUN FAKE_OVERRIDE name:finalize visibility:protected/*protected and package*/ modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:kotlin.Unit [fake_override]
overridden:
protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
compiler/testData/ir/irText/singletons/enumEntry.ir.txt
Vendored
-24
View File
@@ -62,10 +62,6 @@ FILE fqName:<root> fileName:/enumEntry.kt
overridden:
public final fun <get-ordinal> (): kotlin.Int declared in <root>.Z
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:kotlin.Any [fake_override]
overridden:
protected final fun clone (): kotlin.Any declared in <root>.Z
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>, other:<root>.Z) returnType:kotlin.Int [fake_override,operator]
overridden:
public final fun compareTo (other: <root>.Z): kotlin.Int declared in <root>.Z
@@ -76,14 +72,6 @@ FILE fqName:<root> fileName:/enumEntry.kt
public final fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.Z
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
VALUE_PARAMETER name:other index:0 type:kotlin.Any?
FUN FAKE_OVERRIDE name:finalize visibility:protected/*protected and package*/ modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:kotlin.Unit [fake_override]
overridden:
protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in <root>.Z
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] <root>.Z?>? [fake_override]
overridden:
public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] <root>.Z?>? declared in <root>.Z
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:kotlin.Int [fake_override]
overridden:
public final fun hashCode (): kotlin.Int declared in <root>.Z
@@ -110,10 +98,6 @@ FILE fqName:<root> fileName:/enumEntry.kt
overridden:
public final fun <get-ordinal> (): kotlin.Int declared in kotlin.Enum
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:kotlin.Any [fake_override]
overridden:
protected final fun clone (): kotlin.Any declared in kotlin.Enum
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>, other:<root>.Z) returnType:kotlin.Int [fake_override,operator]
overridden:
public final fun compareTo (other: E of kotlin.Enum): kotlin.Int declared in kotlin.Enum
@@ -124,14 +108,6 @@ FILE fqName:<root> fileName:/enumEntry.kt
public final fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Enum
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
VALUE_PARAMETER name:other index:0 type:kotlin.Any?
FUN FAKE_OVERRIDE name:finalize visibility:protected/*protected and package*/ modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:kotlin.Unit [fake_override]
overridden:
protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] <root>.Z?>? [fake_override]
overridden:
public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:kotlin.Int [fake_override]
overridden:
public final fun hashCode (): kotlin.Int declared in kotlin.Enum
compiler/testData/ir/irText/singletons/enumEntry.kt
Vendored
-3
View File
@@ -1,6 +1,3 @@
// IGNORE_BACKEND: JS_IR NATIVE
// ^ KT-61141: absent enum fake_overrides: finalize (K1), getDeclaringClass (K1), clone (K2)
enum class Z {
ENTRY {
fun test() {}
compiler/testData/ir/irText/singletons/enumEntry.sig.kt.txt
Vendored
+46 -62
View File
@@ -39,24 +39,14 @@ open enum class Z : Enum<Z> {
// Public signature: /Z.ENTRY.<EEC>.<init>|-5645683436151566731[0]
// Public signature debug description: <init>(){}
private constructor() /* primary */
// CHECK JVM_IR:
// Mangled name: Z.ENTRY#clone(){}kotlin.Any
// Public signature: /Z.ENTRY.<EEC>.clone|-6903128697527593263[0]
// Public signature debug description: clone(){}kotlin.Any
// CHECK JS_IR NATIVE:
// Mangled name: Z.ENTRY#compareTo(Z){}
// Public signature: /Z.ENTRY.<EEC>.compareTo|7572315864006954503[0]
// Public signature debug description: compareTo(Z){}
protected /* fake */ override fun clone(): Any
// CHECK JVM_IR:
// Mangled name: Z.ENTRY#compareTo(Z){}kotlin.Int
// Public signature: /Z.ENTRY.<EEC>.compareTo|-7935111597565816011[0]
// Public signature debug description: compareTo(Z){}kotlin.Int
// CHECK JS_IR NATIVE:
// Mangled name: Z.ENTRY#equals(kotlin.Any?){}
// Public signature: /Z.ENTRY.<EEC>.equals|4638265728071529943[0]
// Public signature debug description: equals(kotlin.Any?){}
// Mangled name: Z.ENTRY#compareTo(Z){}
// Public signature: /Z.ENTRY.<EEC>.compareTo|7572315864006954503[0]
// Public signature debug description: compareTo(Z){}
/* fake */ override operator fun compareTo(other: Z): Int
// CHECK JVM_IR:
@@ -64,9 +54,9 @@ open enum class Z : Enum<Z> {
// Public signature: /Z.ENTRY.<EEC>.equals|722809408929142791[0]
// Public signature debug description: equals(kotlin.Any?){}kotlin.Boolean
// CHECK JS_IR NATIVE:
// Mangled name: Z.ENTRY#hashCode(){}
// Public signature: /Z.ENTRY.<EEC>.hashCode|3409210261493131192[0]
// Public signature debug description: hashCode(){}
// Mangled name: Z.ENTRY#equals(kotlin.Any?){}
// Public signature: /Z.ENTRY.<EEC>.equals|4638265728071529943[0]
// Public signature debug description: equals(kotlin.Any?){}
/* fake */ override operator fun equals(other: Any?): Boolean
// CHECK JVM_IR:
@@ -74,9 +64,9 @@ open enum class Z : Enum<Z> {
// Public signature: /Z.ENTRY.<EEC>.hashCode|-8048879360829830756[0]
// Public signature debug description: hashCode(){}kotlin.Int
// CHECK JS_IR NATIVE:
// Mangled name: Z.ENTRY#toString(){}
// Public signature: /Z.ENTRY.<EEC>.toString|-1522858123163872138[0]
// Public signature debug description: toString(){}
// Mangled name: Z.ENTRY#hashCode(){}
// Public signature: /Z.ENTRY.<EEC>.hashCode|3409210261493131192[0]
// Public signature debug description: hashCode(){}
/* fake */ override fun hashCode(): Int
// CHECK JVM_IR:
@@ -84,9 +74,9 @@ open enum class Z : Enum<Z> {
// Public signature: /Z.ENTRY.<EEC>.toString|6958853723545266802[0]
// Public signature debug description: toString(){}kotlin.String
// CHECK JS_IR NATIVE:
// Mangled name: Z.ENTRY#test(){}
// Public signature: /Z.ENTRY.<EEC>.test|6620506149988718649[0]
// Public signature debug description: test(){}
// Mangled name: Z.ENTRY#toString(){}
// Public signature: /Z.ENTRY.<EEC>.toString|-1522858123163872138[0]
// Public signature debug description: toString(){}
/* fake */ override fun toString(): String
// CHECK:
@@ -105,9 +95,9 @@ open enum class Z : Enum<Z> {
// Public signature: /Z.ENTRY.<EEC>.name.<get-name>|-8006111524522882650[0]
// Public signature debug description: <get-name>(){}kotlin.String
// CHECK JS_IR NATIVE:
// Mangled name: Z.ENTRY{}ordinal
// Public signature: /Z.ENTRY.<EEC>.ordinal|1912745122988592376[0]
// Public signature debug description: {}ordinal
// Mangled name: Z.ENTRY#<get-name>(){}
// Public signature: /Z.ENTRY.<EEC>.name.<get-name>|5879344792307730109[0]
// Public signature debug description: <get-name>(){}
/* fake */ override get(): String
// CHECK:
@@ -120,9 +110,9 @@ open enum class Z : Enum<Z> {
// Public signature: /Z.ENTRY.<EEC>.ordinal.<get-ordinal>|-6902664390061762634[0]
// Public signature debug description: <get-ordinal>(){}kotlin.Int
// CHECK JS_IR NATIVE:
// Mangled name: Z#valueOf#static(kotlin.String){}
// Public signature: /Z.valueOf|-4683474617854611729[0]
// Public signature debug description: valueOf#static(kotlin.String){}
// Mangled name: Z.ENTRY#<get-ordinal>(){}
// Public signature: /Z.ENTRY.<EEC>.ordinal.<get-ordinal>|8409904226035914023[0]
// Public signature debug description: <get-ordinal>(){}
/* fake */ override get(): Int
}
@@ -132,9 +122,9 @@ open enum class Z : Enum<Z> {
// Public signature: /Z.valueOf|6700955022581377295[0]
// Public signature debug description: valueOf#static(kotlin.String){}Z
// CHECK JS_IR NATIVE:
// Mangled name: Z#values#static(){}
// Public signature: /Z.values|-8715569000920726747[0]
// Public signature debug description: values#static(){}
// Mangled name: Z#valueOf#static(kotlin.String){}
// Public signature: /Z.valueOf|-4683474617854611729[0]
// Public signature debug description: valueOf#static(kotlin.String){}
fun valueOf(value: String): Z
// CHECK JVM_IR:
@@ -142,29 +132,19 @@ open enum class Z : Enum<Z> {
// Public signature: /Z.values|-4467060086112669746[0]
// Public signature debug description: values#static(){}kotlin.Array<Z>
// CHECK JS_IR NATIVE:
// Mangled name: Z#compareTo(Z){}
// Public signature: /Z.compareTo|7572315864006954503[0]
// Public signature debug description: compareTo(Z){}
// Mangled name: Z#values#static(){}
// Public signature: /Z.values|-8715569000920726747[0]
// Public signature debug description: values#static(){}
fun values(): Array<Z>
// CHECK JVM_IR:
// Mangled name: Z#clone(){}kotlin.Any
// Public signature: /Z.clone|-6903128697527593263[0]
// Public signature debug description: clone(){}kotlin.Any
// CHECK JS_IR NATIVE:
// Mangled name: Z#equals(kotlin.Any?){}
// Public signature: /Z.equals|4638265728071529943[0]
// Public signature debug description: equals(kotlin.Any?){}
protected /* fake */ override fun clone(): Any
// CHECK JVM_IR:
// Mangled name: Z#compareTo(Z){}kotlin.Int
// Public signature: /Z.compareTo|-7935111597565816011[0]
// Public signature debug description: compareTo(Z){}kotlin.Int
// CHECK JS_IR NATIVE:
// Mangled name: Z#hashCode(){}
// Public signature: /Z.hashCode|3409210261493131192[0]
// Public signature debug description: hashCode(){}
// Mangled name: Z#compareTo(Z){}
// Public signature: /Z.compareTo|7572315864006954503[0]
// Public signature debug description: compareTo(Z){}
/* fake */ override operator fun compareTo(other: Z): Int
// CHECK JVM_IR:
@@ -172,9 +152,9 @@ open enum class Z : Enum<Z> {
// Public signature: /Z.equals|722809408929142791[0]
// Public signature debug description: equals(kotlin.Any?){}kotlin.Boolean
// CHECK JS_IR NATIVE:
// Mangled name: Z#toString(){}
// Public signature: /Z.toString|-1522858123163872138[0]
// Public signature debug description: toString(){}
// Mangled name: Z#equals(kotlin.Any?){}
// Public signature: /Z.equals|4638265728071529943[0]
// Public signature debug description: equals(kotlin.Any?){}
/* fake */ override operator fun equals(other: Any?): Boolean
// CHECK JVM_IR:
@@ -182,9 +162,9 @@ open enum class Z : Enum<Z> {
// Public signature: /Z.hashCode|-8048879360829830756[0]
// Public signature debug description: hashCode(){}kotlin.Int
// CHECK JS_IR NATIVE:
// Mangled name: Z#static{}entries
// Public signature: /Z.entries|-5134227801081826149[0]
// Public signature debug description: #static{}entries
// Mangled name: Z#hashCode(){}
// Public signature: /Z.hashCode|3409210261493131192[0]
// Public signature debug description: hashCode(){}
/* fake */ override fun hashCode(): Int
// CHECK JVM_IR:
@@ -192,9 +172,9 @@ open enum class Z : Enum<Z> {
// Public signature: /Z.toString|6958853723545266802[0]
// Public signature debug description: toString(){}kotlin.String
// CHECK JS_IR NATIVE:
// Mangled name: Z#<get-entries>#static(){}
// Public signature: /Z.entries.<get-entries>|-6068527377476727729[0]
// Public signature debug description: <get-entries>#static(){}
// Mangled name: Z#toString(){}
// Public signature: /Z.toString|-1522858123163872138[0]
// Public signature debug description: toString(){}
/* fake */ override fun toString(): String
// CHECK:
@@ -207,9 +187,9 @@ open enum class Z : Enum<Z> {
// Public signature: /Z.entries.<get-entries>|3224480899107517660[0]
// Public signature debug description: <get-entries>#static(){}kotlin.enums.EnumEntries<Z>
// CHECK JS_IR NATIVE:
// Mangled name: Z#<get-name>(){}
// Public signature: /Z.name.<get-name>|5879344792307730109[0]
// Public signature debug description: <get-name>(){}
// Mangled name: Z#<get-entries>#static(){}
// Public signature: /Z.entries.<get-entries>|-6068527377476727729[0]
// Public signature debug description: <get-entries>#static(){}
get(): EnumEntries<Z>
// CHECK:
@@ -222,9 +202,9 @@ open enum class Z : Enum<Z> {
// Public signature: /Z.name.<get-name>|-8006111524522882650[0]
// Public signature debug description: <get-name>(){}kotlin.String
// CHECK JS_IR NATIVE:
// Mangled name: Z#<get-ordinal>(){}
// Public signature: /Z.ordinal.<get-ordinal>|8409904226035914023[0]
// Public signature debug description: <get-ordinal>(){}
// Mangled name: Z#<get-name>(){}
// Public signature: /Z.name.<get-name>|5879344792307730109[0]
// Public signature debug description: <get-name>(){}
/* fake */ override get(): String
// CHECK:
@@ -236,6 +216,10 @@ open enum class Z : Enum<Z> {
// Mangled name: Z#<get-ordinal>(){}kotlin.Int
// Public signature: /Z.ordinal.<get-ordinal>|-6902664390061762634[0]
// Public signature debug description: <get-ordinal>(){}kotlin.Int
// CHECK JS_IR NATIVE:
// Mangled name: Z#<get-ordinal>(){}
// Public signature: /Z.ordinal.<get-ordinal>|8409904226035914023[0]
// Public signature debug description: <get-ordinal>(){}
/* fake */ override get(): Int
}