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/properties/simpleLoopInOverrideScript.txt
Vendored
+31 -30
View File
@@ -4,7 +4,7 @@ FILE: [ResolvedTo(RAW_FIR)] simpleLoopInOverrideScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-simpleLoopInOverrideScript.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? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
public? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -12,7 +12,7 @@ FILE: [ResolvedTo(RAW_FIR)] simpleLoopInOverrideScript.kts
}
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? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -20,7 +20,7 @@ FILE: [ResolvedTo(RAW_FIR)] simpleLoopInOverrideScript.kts
}
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|
public? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -35,7 +35,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-simpleLoopInOverrideScript.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? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
public? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -43,7 +43,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
}
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? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -51,7 +51,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
}
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|
public? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -66,7 +66,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-simpleLoopInOverrideScript.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? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
public? open? override [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] val str: String
@@ -74,7 +74,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
}
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? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -82,7 +82,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
}
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|
public? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -97,7 +97,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-simpleLoopInOverrideScript.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? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
public? open? override [ResolvedTo(COMPANION_GENERATION)] val str: String
@@ -105,7 +105,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
}
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? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -113,7 +113,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
}
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|
public? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -128,7 +128,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-simpleLoopInOverrideScript.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? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
public? open? override [ResolvedTo(SUPER_TYPES)] val str: String
@@ -136,7 +136,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.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? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -144,7 +144,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
}
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|
public? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -159,7 +159,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-simpleLoopInOverrideScript.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? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
public? open? override [ResolvedTo(TYPES)] val str: R|kotlin/String|
@@ -167,7 +167,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.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? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -175,7 +175,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
}
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|
public? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -198,7 +198,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.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? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -206,7 +206,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
}
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|
public? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -229,7 +229,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.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? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -237,7 +237,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
}
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|
public? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -260,7 +260,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.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? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -268,7 +268,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
}
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|
public? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -291,7 +291,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.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? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -299,7 +299,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
}
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|
public? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -322,7 +322,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.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? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -330,7 +330,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
}
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|
public? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -353,7 +353,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.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? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -361,7 +361,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
}
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|
public? open? override [ResolvedTo(RAW_FIR)] val str: String
@@ -399,3 +399,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] simpleLoopInOverrideScript.kts
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Foo3] get(): R|kotlin/String|
}