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

[FIR] Initialize public visibility for class-like declarations at FIR building phase if no modifier is presented

Browse Source 
Java resolving subsystem requires calculated visibility for correct disambiguation of supertypes.
But visibility remains `Unknown` for Kotlin class-like declarations during supertypes resolving because `STATUS` resolve phase is performed after `SUPER_TYPES` phase.
To fix the problem, the visibility should be initialized to public at the FIR building phase if no modifier is presented.

^KT-64127 Fixed
This commit is contained in:
Ivan Kochurkin
2023-12-13 23:57:19 +01:00
committed by Space Team
parent ee8d42532b
commit 69b9bfc3e0
915 changed files with 12362 additions and 12164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/testData/lazyResolve/enumEntriesScript.txt
Vendored
+7 -6
View File
@@ -4,7 +4,7 @@ FILE: [ResolvedTo(RAW_FIR)] enumEntriesScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-enumEntriesScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
public final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
LAZY_super<R|kotlin/Enum<one/MyEnum>|>
}
@@ -28,7 +28,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-enumEntriesScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
public final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
LAZY_super<R|kotlin/Enum<one/MyEnum>|>
}
@@ -52,7 +52,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-enumEntriesScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
public final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
LAZY_super<R|kotlin/Enum<one/MyEnum>|>
}
@@ -76,7 +76,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-enumEntriesScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
public final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
LAZY_super<R|kotlin/Enum<one/MyEnum>|>
}
@@ -100,7 +100,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-enumEntriesScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(SUPER_TYPES)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
public final? [ResolvedTo(SUPER_TYPES)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
LAZY_super<R|kotlin/Enum<one/MyEnum>|>
}
@@ -124,7 +124,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-enumEntriesScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(TYPES)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
public final? [ResolvedTo(TYPES)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
LAZY_super<R|kotlin/Enum<one/MyEnum>|>
}
@@ -308,3 +308,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] enumEntriesScript.kts
public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/enums/EnumEntries<one/MyEnum>|
}