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/simpleLoopInOverride2.txt
Vendored
+30 -30
View File
@@ -1,20 +1,20 @@
RAW_FIR:
FILE: [ResolvedTo(RAW_FIR)] simpleLoopInOverride2.kt
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)] val str: String
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
}
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
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): String
}
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
@@ -24,21 +24,21 @@ FILE: [ResolvedTo(RAW_FIR)] simpleLoopInOverride2.kt
IMPORTS:
FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
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)] val str: String
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo1] get(): String
}
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
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): String
}
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
@@ -48,21 +48,21 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
COMPILER_REQUIRED_ANNOTATIONS:
FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
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(COMPILER_REQUIRED_ANNOTATIONS)] val str: String
public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=Foo1] get(): String
}
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
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): String
}
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
@@ -72,21 +72,21 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
COMPANION_GENERATION:
FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
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(COMPANION_GENERATION)] val str: String
public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=Foo1] get(): String
}
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
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): String
}
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
@@ -96,21 +96,21 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
SUPER_TYPES:
FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
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(RAW_FIR)] fun foo(): R|kotlin/Unit|
public? final? [ResolvedTo(SUPER_TYPES)] val str: String
public? [ResolvedTo(SUPER_TYPES)] [ContainingClassKey=Foo1] get(): String
}
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
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): String
}
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
@@ -120,21 +120,21 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
TYPES:
FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
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(RAW_FIR)] fun foo(): R|kotlin/Unit|
public? final? [ResolvedTo(TYPES)] val str: R|kotlin/String|
public? [ResolvedTo(TYPES)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
}
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
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): String
}
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
@@ -151,14 +151,14 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
public [ResolvedTo(STATUS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
}
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
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): String
}
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
@@ -175,14 +175,14 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
}
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
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): String
}
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
@@ -199,14 +199,14 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
}
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
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): String
}
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
@@ -223,14 +223,14 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
}
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
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): String
}
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
@@ -247,14 +247,14 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
}
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
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): String
}
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
@@ -271,14 +271,14 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Foo1] get(): R|kotlin/String|
}
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
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo2] get(): String
}
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