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

K1/K2: add Enum.entries unconditionally and filter them out in tower

Browse Source 
Before this commit, we added Enum.entries only in case when
LanguageFeature.EnumEntries was ON (with an exception in K1/Java case).
In this commit we add Enum.entries unconditionally, and in case
the language feature is OFF we filter them out during tower resolve.
This commit is contained in:
Mikhail Glukhikh
2022-07-27 11:22:49 +02:00
committed by Space
parent 0a5b3f1e13
commit 7333589663
97 changed files with 322 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/AnnotationInAnnotationArguments.txt
Vendored
+3
View File
@@ -10,6 +10,9 @@ public final enum class E : R|kotlin/Enum<test/E>| {
public final static fun values(): R|kotlin/Array<test/E>| {
}
public final static val entries: R|kotlin/enums/EnumEntries<test/E>|
public get(): R|kotlin/enums/EnumEntries<test/E>|
private constructor(): R|test/E|
public final static enum entry ENTRY: R|test/E|
compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/EnumArgumentWithCustomToString.txt
Vendored
+3
View File
@@ -5,6 +5,9 @@ public final enum class E : R|kotlin/Enum<test/E>| {
public final static fun values(): R|kotlin/Array<test/E>| {
}
public final static val entries: R|kotlin/enums/EnumEntries<test/E>|
public get(): R|kotlin/enums/EnumEntries<test/E>|
private constructor(): R|test/E|
public final static enum entry CAKE: R|test/E|
compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/EnumEntry.txt
Vendored
+3
View File
@@ -21,6 +21,9 @@ public final enum class Eee : R|kotlin/Enum<test/Eee>| {
public final static fun values(): R|kotlin/Array<test/Eee>| {
}
public final static val entries: R|kotlin/enums/EnumEntries<test/Eee>|
public get(): R|kotlin/enums/EnumEntries<test/Eee>|
private constructor(): R|test/Eee|
public final static enum entry Entry1: R|test/Eee|
compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/EnumConstructor.txt
Vendored
+3
View File
@@ -15,6 +15,9 @@ public final enum class E : R|kotlin/Enum<test/E>| {
public final static fun values(): R|kotlin/Array<test/E>| {
}
public final static val entries: R|kotlin/enums/EnumEntries<test/E>|
public get(): R|kotlin/enums/EnumEntries<test/E>|
public final val x: R|kotlin/String|
public get(): R|kotlin/String|
compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/EnumWithGenericConstructorParameter.txt
Vendored
+3
View File
@@ -5,6 +5,9 @@ public final enum class EnumWithGenericConstructorParameter : R|kotlin/Enum<test
public final static fun values(): R|kotlin/Array<test/EnumWithGenericConstructorParameter>| {
}
public final static val entries: R|kotlin/enums/EnumEntries<test/EnumWithGenericConstructorParameter>|
public get(): R|kotlin/enums/EnumEntries<test/EnumWithGenericConstructorParameter>|
private constructor(list: R|kotlin/collections/List<kotlin/String>?|): R|test/EnumWithGenericConstructorParameter|
}
compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt
Vendored
+3
View File
@@ -5,6 +5,9 @@ public final enum class EnumWithPrimitiveConstructorParameter : R|kotlin/Enum<te
public final static fun values(): R|kotlin/Array<test/EnumWithPrimitiveConstructorParameter>| {
}
public final static val entries: R|kotlin/enums/EnumEntries<test/EnumWithPrimitiveConstructorParameter>|
public get(): R|kotlin/enums/EnumEntries<test/EnumWithPrimitiveConstructorParameter>|
private constructor(b: R|kotlin/Boolean|): R|test/EnumWithPrimitiveConstructorParameter|
}
compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/EnumVisibility.txt
Vendored
+9
View File
@@ -5,6 +5,9 @@ internal final enum class In : R|kotlin/Enum<test/In>| {
public final static fun values(): R|kotlin/Array<test/In>| {
}
public final static val entries: R|kotlin/enums/EnumEntries<test/In>|
public get(): R|kotlin/enums/EnumEntries<test/In>|
private constructor(): R|test/In|
public final static enum entry A: R|test/In|
@@ -17,6 +20,9 @@ private final enum class Pr : R|kotlin/Enum<test/Pr>| {
public final static fun values(): R|kotlin/Array<test/Pr>| {
}
public final static val entries: R|kotlin/enums/EnumEntries<test/Pr>|
public get(): R|kotlin/enums/EnumEntries<test/Pr>|
private constructor(): R|test/Pr|
public final static enum entry A: R|test/Pr|
@@ -29,6 +35,9 @@ public final enum class Pu : R|kotlin/Enum<test/Pu>| {
public final static fun values(): R|kotlin/Array<test/Pu>| {
}
public final static val entries: R|kotlin/enums/EnumEntries<test/Pu>|
public get(): R|kotlin/enums/EnumEntries<test/Pu>|
private constructor(): R|test/Pu|
public final static enum entry A: R|test/Pu|
compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/EnumWithConstuctor.txt
Vendored
+3
View File
@@ -8,6 +8,9 @@ public final enum class En : R|kotlin/Enum<test/En>| {
public final val b: R|kotlin/Boolean|
public get(): R|kotlin/Boolean|
public final static val entries: R|kotlin/enums/EnumEntries<test/En>|
public get(): R|kotlin/enums/EnumEntries<test/En>|
public final val i: R|kotlin/Int|
public get(): R|kotlin/Int|
compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/EnumWithInnerClasses.txt
Vendored
+3
View File
@@ -23,6 +23,9 @@ public final enum class Enum : R|kotlin/Enum<test/Enum>| {
public final val c: R|kotlin/Int|
public get(): R|kotlin/Int|
public final static val entries: R|kotlin/enums/EnumEntries<test/Enum>|
public get(): R|kotlin/enums/EnumEntries<test/Enum>|
private constructor(): R|test/Enum|
public final static enum entry ENTRY1: R|test/Enum|
compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/InnerEnum.txt
Vendored
+3
View File
@@ -6,6 +6,9 @@ public final class A : R|kotlin/Any| {
public final static fun values(): R|kotlin/Array<test/A.E>| {
}
public final static val entries: R|kotlin/enums/EnumEntries<test/A.E>|
public get(): R|kotlin/enums/EnumEntries<test/A.E>|
private constructor(): R|test/A.E|
public final static enum entry ENTRY: R|test/A.E|
compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/InnerEnumExistingClassObject.txt
Vendored
+3
View File
@@ -11,6 +11,9 @@ public final class A : R|kotlin/Any| {
public final static fun values(): R|kotlin/Array<test/A.E>| {
}
public final static val entries: R|kotlin/enums/EnumEntries<test/A.E>|
public get(): R|kotlin/enums/EnumEntries<test/A.E>|
private constructor(): R|test/A.E|
public final static enum entry ENTRY: R|test/A.E|
compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/SimpleEnum.txt
Vendored
+3
View File
@@ -5,6 +5,9 @@ public final enum class MyEnum : R|kotlin/Enum<test/MyEnum>| {
public final static fun values(): R|kotlin/Array<test/MyEnum>| {
}
public final static val entries: R|kotlin/enums/EnumEntries<test/MyEnum>|
public get(): R|kotlin/enums/EnumEntries<test/MyEnum>|
private constructor(): R|test/MyEnum|
public final static enum entry ENTRY: R|test/MyEnum|
compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/Enum.txt
Vendored
+3
View File
@@ -5,6 +5,9 @@ public final enum class Test : R|kotlin/Enum<test/Test>| {
public final static fun values(): R|kotlin/Array<test/Test>| {
}
public final static val entries: R|kotlin/enums/EnumEntries<test/Test>|
public get(): R|kotlin/enums/EnumEntries<test/Test>|
private constructor(a: R|kotlin/Int|): R|test/Test|
public final static enum entry A: R|test/Test|
compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/EnumEntries.txt
Vendored
+3
View File
@@ -5,6 +5,9 @@ public final enum class E : R|kotlin/Enum<test/E>| {
public final static fun values(): R|kotlin/Array<test/E>| {
}
public final static val entries: R|kotlin/enums/EnumEntries<test/E>|
public get(): R|kotlin/enums/EnumEntries<test/E>|
private constructor(): R|test/E|
public final static enum entry ONE: R|test/E|