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/functions/simpleLoopInOverride2Script.txt
Vendored
+31 -30
View File
@@ -4,17 +4,17 @@ FILE: [ResolvedTo(RAW_FIR)] simpleLoopInOverride2Script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-simpleLoopInOverride2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 {
public final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 {
public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo3 {
public final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo3 {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
public final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
@@ -26,17 +26,17 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-simpleLoopInOverride2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 {
public final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 {
public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo3 {
public final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo3 {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
public final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
@@ -48,17 +48,17 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-simpleLoopInOverride2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 {
public final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 {
public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun foo(): R|kotlin/Unit|
}
public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo3 {
public final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo3 {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
public final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
@@ -70,17 +70,17 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-simpleLoopInOverride2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 {
public final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 {
public? final? [ResolvedTo(COMPANION_GENERATION)] fun foo(): R|kotlin/Unit|
}
public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo3 {
public final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo3 {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
public? final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
public final? [ResolvedTo(RAW_FIR)] interface Foo3 : Foo1 {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
@@ -92,17 +92,17 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-simpleLoopInOverride2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
public? final? [ResolvedTo(SUPER_TYPES)] fun foo(): R|kotlin/Unit|
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
@@ -114,17 +114,17 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-simpleLoopInOverride2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(TYPES)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
public final? [ResolvedTo(TYPES)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
public? final? [ResolvedTo(TYPES)] fun foo(): R|kotlin/Unit|
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
@@ -141,12 +141,12 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
@@ -163,12 +163,12 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
@@ -185,12 +185,12 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
@@ -207,12 +207,12 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
@@ -229,12 +229,12 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
@@ -251,12 +251,12 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : <ERROR TYPE REF: Loop in supertype: /Foo2 -> /Foo3> {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo3 : <ERROR TYPE REF: Loop in supertype: /Foo3 -> /Foo1> {
public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
}
@@ -282,3 +282,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] simpleLoopInOverride2Script.kts
public abstract override [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
}