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/firProblems/lambdaInEnumEntryConstructorCall.fir.ir.txt
Vendored
-12
View File
@@ -75,10 +75,6 @@ FILE fqName:<root> fileName:/lambdaInEnumEntryConstructorCall.kt
FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.ConfigurationParameter>
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>.ConfigurationParameter>) 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>.ConfigurationParameter>
FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.ConfigurationParameter>, other:<root>.ConfigurationParameter) returnType:kotlin.Int [fake_override,operator]
overridden:
public final fun compareTo (other: E of kotlin.Enum): kotlin.Int declared in kotlin.Enum
@@ -115,11 +111,3 @@ FILE fqName:<root> fileName:/lambdaInEnumEntryConstructorCall.kt
overridden:
public final fun <get-ordinal> (): kotlin.Int declared in kotlin.Enum
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.ConfigurationParameter>
FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.ConfigurationParameter>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] <root>.ConfigurationParameter?>? [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>.ConfigurationParameter>
FUN FAKE_OVERRIDE name:finalize visibility:protected/*protected and package*/ modality:FINAL <> ($this:kotlin.Enum<<root>.ConfigurationParameter>) 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>.ConfigurationParameter>
compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.ir.txt
Vendored
-12
View File
@@ -84,10 +84,6 @@ FILE fqName:<root> fileName:/lambdaInEnumEntryConstructorCall.kt
overridden:
public final fun <get-ordinal> (): kotlin.Int declared in kotlin.Enum
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.ConfigurationParameter>
FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum<<root>.ConfigurationParameter>) 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>.ConfigurationParameter>
FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.ConfigurationParameter>, other:<root>.ConfigurationParameter) returnType:kotlin.Int [fake_override,operator]
overridden:
public final fun compareTo (other: E of kotlin.Enum): kotlin.Int declared in kotlin.Enum
@@ -98,14 +94,6 @@ FILE fqName:<root> fileName:/lambdaInEnumEntryConstructorCall.kt
public final fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Enum
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.ConfigurationParameter>
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>.ConfigurationParameter>) 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>.ConfigurationParameter>
FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.ConfigurationParameter>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] <root>.ConfigurationParameter?>? [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>.ConfigurationParameter>
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.ConfigurationParameter>) returnType:kotlin.Int [fake_override]
overridden:
public final fun hashCode (): kotlin.Int declared in kotlin.Enum
compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.kt
Vendored
-2
View File
@@ -1,6 +1,4 @@
// WITH_STDLIB
// IGNORE_BACKEND: JS_IR NATIVE
// ^ KT-61141: absent enum fake_overrides: finalize, getDeclaringClass, clone
class Wrapper(var baseUrl: String)
compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.sig.kt.txt
Vendored
+22 -28
View File
@@ -64,24 +64,14 @@ enum class ConfigurationParameter : Enum<ConfigurationParameter> {
// Public signature debug description: values#static(){}
fun values(): Array<ConfigurationParameter>
// CHECK JVM_IR:
// Mangled name: ConfigurationParameter#clone(){}kotlin.Any
// Public signature: /ConfigurationParameter.clone|-6903128697527593263[0]
// Public signature debug description: clone(){}kotlin.Any
// CHECK JS_IR NATIVE:
// Mangled name: ConfigurationParameter#compareTo(ConfigurationParameter){}
// Public signature: /ConfigurationParameter.compareTo|1827634897792549080[0]
// Public signature debug description: compareTo(ConfigurationParameter){}
protected /* fake */ override fun clone(): Any
// CHECK JVM_IR:
// Mangled name: ConfigurationParameter#compareTo(ConfigurationParameter){}kotlin.Int
// Public signature: /ConfigurationParameter.compareTo|-5479522582886187389[0]
// Public signature debug description: compareTo(ConfigurationParameter){}kotlin.Int
// CHECK JS_IR NATIVE:
// Mangled name: ConfigurationParameter#equals(kotlin.Any?){}
// Public signature: /ConfigurationParameter.equals|4638265728071529943[0]
// Public signature debug description: equals(kotlin.Any?){}
// Mangled name: ConfigurationParameter#compareTo(ConfigurationParameter){}
// Public signature: /ConfigurationParameter.compareTo|1827634897792549080[0]
// Public signature debug description: compareTo(ConfigurationParameter){}
/* fake */ override operator fun compareTo(other: ConfigurationParameter): Int
// CHECK JVM_IR:
@@ -89,9 +79,9 @@ enum class ConfigurationParameter : Enum<ConfigurationParameter> {
// Public signature: /ConfigurationParameter.equals|722809408929142791[0]
// Public signature debug description: equals(kotlin.Any?){}kotlin.Boolean
// CHECK JS_IR NATIVE:
// Mangled name: ConfigurationParameter#hashCode(){}
// Public signature: /ConfigurationParameter.hashCode|3409210261493131192[0]
// Public signature debug description: hashCode(){}
// Mangled name: ConfigurationParameter#equals(kotlin.Any?){}
// Public signature: /ConfigurationParameter.equals|4638265728071529943[0]
// Public signature debug description: equals(kotlin.Any?){}
/* fake */ override operator fun equals(other: Any?): Boolean
// CHECK JVM_IR:
@@ -99,9 +89,9 @@ enum class ConfigurationParameter : Enum<ConfigurationParameter> {
// Public signature: /ConfigurationParameter.hashCode|-8048879360829830756[0]
// Public signature debug description: hashCode(){}kotlin.Int
// CHECK JS_IR NATIVE:
// Mangled name: ConfigurationParameter#toString(){}
// Public signature: /ConfigurationParameter.toString|-1522858123163872138[0]
// Public signature debug description: toString(){}
// Mangled name: ConfigurationParameter#hashCode(){}
// Public signature: /ConfigurationParameter.hashCode|3409210261493131192[0]
// Public signature debug description: hashCode(){}
/* fake */ override fun hashCode(): Int
// CHECK JVM_IR:
@@ -109,9 +99,9 @@ enum class ConfigurationParameter : Enum<ConfigurationParameter> {
// Public signature: /ConfigurationParameter.toString|6958853723545266802[0]
// Public signature debug description: toString(){}kotlin.String
// CHECK JS_IR NATIVE:
// Mangled name: ConfigurationParameter#static{}entries
// Public signature: /ConfigurationParameter.entries|-5134227801081826149[0]
// Public signature debug description: #static{}entries
// Mangled name: ConfigurationParameter#toString(){}
// Public signature: /ConfigurationParameter.toString|-1522858123163872138[0]
// Public signature debug description: toString(){}
/* fake */ override fun toString(): String
// CHECK:
@@ -124,9 +114,9 @@ enum class ConfigurationParameter : Enum<ConfigurationParameter> {
// Public signature: /ConfigurationParameter.entries.<get-entries>|-1947990751381640787[0]
// Public signature debug description: <get-entries>#static(){}kotlin.enums.EnumEntries<ConfigurationParameter>
// CHECK JS_IR NATIVE:
// Mangled name: ConfigurationParameter{}name
// Public signature: /ConfigurationParameter.name|4231860309499509769[0]
// Public signature debug description: {}name
// Mangled name: ConfigurationParameter#<get-entries>#static(){}
// Public signature: /ConfigurationParameter.entries.<get-entries>|-6068527377476727729[0]
// Public signature debug description: <get-entries>#static(){}
get(): EnumEntries<ConfigurationParameter>
// CHECK:
@@ -139,9 +129,9 @@ enum class ConfigurationParameter : Enum<ConfigurationParameter> {
// Public signature: /ConfigurationParameter.name.<get-name>|-8006111524522882650[0]
// Public signature debug description: <get-name>(){}kotlin.String
// CHECK JS_IR NATIVE:
// Mangled name: ConfigurationParameter{}ordinal
// Public signature: /ConfigurationParameter.ordinal|1912745122988592376[0]
// Public signature debug description: {}ordinal
// Mangled name: ConfigurationParameter#<get-name>(){}
// Public signature: /ConfigurationParameter.name.<get-name>|5879344792307730109[0]
// Public signature debug description: <get-name>(){}
/* fake */ override get(): String
// CHECK:
@@ -153,6 +143,10 @@ enum class ConfigurationParameter : Enum<ConfigurationParameter> {
// Mangled name: ConfigurationParameter#<get-ordinal>(){}kotlin.Int
// Public signature: /ConfigurationParameter.ordinal.<get-ordinal>|-6902664390061762634[0]
// Public signature debug description: <get-ordinal>(){}kotlin.Int
// CHECK JS_IR NATIVE:
// Mangled name: ConfigurationParameter#<get-ordinal>(){}
// Public signature: /ConfigurationParameter.ordinal.<get-ordinal>|8409904226035914023[0]
// Public signature debug description: <get-ordinal>(){}
/* fake */ override get(): Int
}
compiler/testData/ir/irText/firProblems/thisInEnumConstructor.fir.ir.txt
Vendored
-12
View File
@@ -34,10 +34,6 @@ FILE fqName:<root> fileName:/thisInEnumConstructor.kt
FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.EE>
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>.EE>) 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>.EE>
FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.EE>, other:<root>.EE) returnType:kotlin.Int [fake_override,operator]
overridden:
public final fun compareTo (other: E of kotlin.Enum): kotlin.Int declared in kotlin.Enum
@@ -74,11 +70,3 @@ FILE fqName:<root> fileName:/thisInEnumConstructor.kt
overridden:
public final fun <get-ordinal> (): kotlin.Int declared in kotlin.Enum
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.EE>
FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.EE>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] <root>.EE?>? [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>.EE>
FUN FAKE_OVERRIDE name:finalize visibility:protected/*protected and package*/ modality:FINAL <> ($this:kotlin.Enum<<root>.EE>) 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>.EE>
compiler/testData/ir/irText/firProblems/thisInEnumConstructor.ir.txt
Vendored
-12
View File
@@ -43,10 +43,6 @@ FILE fqName:<root> fileName:/thisInEnumConstructor.kt
overridden:
public final fun <get-ordinal> (): kotlin.Int declared in kotlin.Enum
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.EE>
FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum<<root>.EE>) 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>.EE>
FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.EE>, other:<root>.EE) returnType:kotlin.Int [fake_override,operator]
overridden:
public final fun compareTo (other: E of kotlin.Enum): kotlin.Int declared in kotlin.Enum
@@ -57,14 +53,6 @@ FILE fqName:<root> fileName:/thisInEnumConstructor.kt
public final fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Enum
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.EE>
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>.EE>) 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>.EE>
FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.EE>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] <root>.EE?>? [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>.EE>
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.EE>) returnType:kotlin.Int [fake_override]
overridden:
public final fun hashCode (): kotlin.Int declared in kotlin.Enum
compiler/testData/ir/irText/firProblems/thisInEnumConstructor.kt
Vendored
-4
View File
@@ -1,8 +1,4 @@
// WITH_STDLIB
// IGNORE_BACKEND: JS_IR
// KT-61141: absent enum fake_overrides: finalize, getDeclaringClass, clone
// IGNORE_BACKEND: NATIVE
enum class EE(val myName: String = this.toString().lowercase()) {
ENTRY;
compiler/testData/ir/irText/firProblems/thisInEnumConstructor.sig.kt.txt
Vendored
+22 -28
View File
@@ -47,24 +47,14 @@ enum class EE : Enum<EE> {
// Public signature debug description: values#static(){}
fun values(): Array<EE>
// CHECK JVM_IR:
// Mangled name: EE#clone(){}kotlin.Any
// Public signature: /EE.clone|-6903128697527593263[0]
// Public signature debug description: clone(){}kotlin.Any
// CHECK JS_IR NATIVE:
// Mangled name: EE#compareTo(EE){}
// Public signature: /EE.compareTo|599571267222383379[0]
// Public signature debug description: compareTo(EE){}
protected /* fake */ override fun clone(): Any
// CHECK JVM_IR:
// Mangled name: EE#compareTo(EE){}kotlin.Int
// Public signature: /EE.compareTo|2516455132911655234[0]
// Public signature debug description: compareTo(EE){}kotlin.Int
// CHECK JS_IR NATIVE:
// Mangled name: EE#equals(kotlin.Any?){}
// Public signature: /EE.equals|4638265728071529943[0]
// Public signature debug description: equals(kotlin.Any?){}
// Mangled name: EE#compareTo(EE){}
// Public signature: /EE.compareTo|599571267222383379[0]
// Public signature debug description: compareTo(EE){}
/* fake */ override operator fun compareTo(other: EE): Int
// CHECK JVM_IR:
@@ -72,9 +62,9 @@ enum class EE : Enum<EE> {
// Public signature: /EE.equals|722809408929142791[0]
// Public signature debug description: equals(kotlin.Any?){}kotlin.Boolean
// CHECK JS_IR NATIVE:
// Mangled name: EE#hashCode(){}
// Public signature: /EE.hashCode|3409210261493131192[0]
// Public signature debug description: hashCode(){}
// Mangled name: EE#equals(kotlin.Any?){}
// Public signature: /EE.equals|4638265728071529943[0]
// Public signature debug description: equals(kotlin.Any?){}
/* fake */ override operator fun equals(other: Any?): Boolean
// CHECK JVM_IR:
@@ -82,9 +72,9 @@ enum class EE : Enum<EE> {
// Public signature: /EE.hashCode|-8048879360829830756[0]
// Public signature debug description: hashCode(){}kotlin.Int
// CHECK JS_IR NATIVE:
// Mangled name: EE#toString(){}
// Public signature: /EE.toString|-1522858123163872138[0]
// Public signature debug description: toString(){}
// Mangled name: EE#hashCode(){}
// Public signature: /EE.hashCode|3409210261493131192[0]
// Public signature debug description: hashCode(){}
/* fake */ override fun hashCode(): Int
// CHECK JVM_IR:
@@ -92,9 +82,9 @@ enum class EE : Enum<EE> {
// Public signature: /EE.toString|6958853723545266802[0]
// Public signature debug description: toString(){}kotlin.String
// CHECK JS_IR NATIVE:
// Mangled name: EE#static{}entries
// Public signature: /EE.entries|-5134227801081826149[0]
// Public signature debug description: #static{}entries
// Mangled name: EE#toString(){}
// Public signature: /EE.toString|-1522858123163872138[0]
// Public signature debug description: toString(){}
/* fake */ override fun toString(): String
// CHECK:
@@ -107,9 +97,9 @@ enum class EE : Enum<EE> {
// Public signature: /EE.entries.<get-entries>|280536622699226117[0]
// Public signature debug description: <get-entries>#static(){}kotlin.enums.EnumEntries<EE>
// CHECK JS_IR NATIVE:
// Mangled name: EE{}name
// Public signature: /EE.name|4231860309499509769[0]
// Public signature debug description: {}name
// Mangled name: EE#<get-entries>#static(){}
// Public signature: /EE.entries.<get-entries>|-6068527377476727729[0]
// Public signature debug description: <get-entries>#static(){}
get(): EnumEntries<EE>
// CHECK:
@@ -122,9 +112,9 @@ enum class EE : Enum<EE> {
// Public signature: /EE.name.<get-name>|-8006111524522882650[0]
// Public signature debug description: <get-name>(){}kotlin.String
// CHECK JS_IR NATIVE:
// Mangled name: EE{}ordinal
// Public signature: /EE.ordinal|1912745122988592376[0]
// Public signature debug description: {}ordinal
// Mangled name: EE#<get-name>(){}
// Public signature: /EE.name.<get-name>|5879344792307730109[0]
// Public signature debug description: <get-name>(){}
/* fake */ override get(): String
// CHECK:
@@ -136,6 +126,10 @@ enum class EE : Enum<EE> {
// Mangled name: EE#<get-ordinal>(){}kotlin.Int
// Public signature: /EE.ordinal.<get-ordinal>|-6902664390061762634[0]
// Public signature debug description: <get-ordinal>(){}kotlin.Int
// CHECK JS_IR NATIVE:
// Mangled name: EE#<get-ordinal>(){}
// Public signature: /EE.ordinal.<get-ordinal>|8409904226035914023[0]
// Public signature debug description: <get-ordinal>(){}
/* fake */ override get(): Int
}