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/cyclicHierarchyScript.txt
Vendored
+67 -66
View File
@@ -4,22 +4,22 @@ FILE: [ResolvedTo(RAW_FIR)] cyclicHierarchyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-cyclicHierarchyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] interface B : A, ResolveMe {
public final? [ResolvedTo(RAW_FIR)] interface B : A, ResolveMe {
}
public? final? [ResolvedTo(RAW_FIR)] interface C : B {
public final? [ResolvedTo(RAW_FIR)] interface C : B {
}
public? final? [ResolvedTo(RAW_FIR)] interface D : B {
public final? [ResolvedTo(RAW_FIR)] interface D : B {
}
public? final? [ResolvedTo(RAW_FIR)] interface ResolveMe : F {
public final? [ResolvedTo(RAW_FIR)] interface ResolveMe : F {
}
public? final? [ResolvedTo(RAW_FIR)] interface F : D, C {
public final? [ResolvedTo(RAW_FIR)] interface F : D, C {
}
public? final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
public final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
}
@@ -29,22 +29,22 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-cyclicHierarchyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] interface B : A, ResolveMe {
public final? [ResolvedTo(RAW_FIR)] interface B : A, ResolveMe {
}
public? final? [ResolvedTo(RAW_FIR)] interface C : B {
public final? [ResolvedTo(RAW_FIR)] interface C : B {
}
public? final? [ResolvedTo(RAW_FIR)] interface D : B {
public final? [ResolvedTo(RAW_FIR)] interface D : B {
}
public? final? [ResolvedTo(RAW_FIR)] interface ResolveMe : F {
public final? [ResolvedTo(RAW_FIR)] interface ResolveMe : F {
}
public? final? [ResolvedTo(RAW_FIR)] interface F : D, C {
public final? [ResolvedTo(RAW_FIR)] interface F : D, C {
}
public? final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
public final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
}
@@ -54,22 +54,22 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-cyclicHierarchyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] interface B : A, ResolveMe {
public final? [ResolvedTo(RAW_FIR)] interface B : A, ResolveMe {
}
public? final? [ResolvedTo(RAW_FIR)] interface C : B {
public final? [ResolvedTo(RAW_FIR)] interface C : B {
}
public? final? [ResolvedTo(RAW_FIR)] interface D : B {
public final? [ResolvedTo(RAW_FIR)] interface D : B {
}
public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] interface ResolveMe : F {
public final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] interface ResolveMe : F {
}
public? final? [ResolvedTo(RAW_FIR)] interface F : D, C {
public final? [ResolvedTo(RAW_FIR)] interface F : D, C {
}
public? final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
public final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
}
@@ -79,22 +79,22 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-cyclicHierarchyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] interface B : A, ResolveMe {
public final? [ResolvedTo(RAW_FIR)] interface B : A, ResolveMe {
}
public? final? [ResolvedTo(RAW_FIR)] interface C : B {
public final? [ResolvedTo(RAW_FIR)] interface C : B {
}
public? final? [ResolvedTo(RAW_FIR)] interface D : B {
public final? [ResolvedTo(RAW_FIR)] interface D : B {
}
public? final? [ResolvedTo(COMPANION_GENERATION)] interface ResolveMe : F {
public final? [ResolvedTo(COMPANION_GENERATION)] interface ResolveMe : F {
}
public? final? [ResolvedTo(RAW_FIR)] interface F : D, C {
public final? [ResolvedTo(RAW_FIR)] interface F : D, C {
}
public? final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
public final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
}
@@ -104,22 +104,22 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-cyclicHierarchyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
public final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface C : <ERROR TYPE REF: Loop in supertype: /C -> /B> {
public final? [ResolvedTo(SUPER_TYPES)] interface C : <ERROR TYPE REF: Loop in supertype: /C -> /B> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface D : <ERROR TYPE REF: Loop in supertype: /D -> /B> {
public final? [ResolvedTo(SUPER_TYPES)] interface D : <ERROR TYPE REF: Loop in supertype: /D -> /B> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface ResolveMe : <ERROR TYPE REF: Loop in supertype: /ResolveMe -> /F> {
public final? [ResolvedTo(SUPER_TYPES)] interface ResolveMe : <ERROR TYPE REF: Loop in supertype: /ResolveMe -> /F> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D>, <ERROR TYPE REF: Loop in supertype: /F -> /C> {
public final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D>, <ERROR TYPE REF: Loop in supertype: /F -> /C> {
}
public? final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
public final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
}
@@ -129,22 +129,22 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-cyclicHierarchyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
public final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface C : <ERROR TYPE REF: Loop in supertype: /C -> /B> {
public final? [ResolvedTo(SUPER_TYPES)] interface C : <ERROR TYPE REF: Loop in supertype: /C -> /B> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface D : <ERROR TYPE REF: Loop in supertype: /D -> /B> {
public final? [ResolvedTo(SUPER_TYPES)] interface D : <ERROR TYPE REF: Loop in supertype: /D -> /B> {
}
public? final? [ResolvedTo(TYPES)] interface ResolveMe : <ERROR TYPE REF: Loop in supertype: /ResolveMe -> /F> {
public final? [ResolvedTo(TYPES)] interface ResolveMe : <ERROR TYPE REF: Loop in supertype: /ResolveMe -> /F> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D>, <ERROR TYPE REF: Loop in supertype: /F -> /C> {
public final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D>, <ERROR TYPE REF: Loop in supertype: /F -> /C> {
}
public? final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
public final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
}
@@ -154,22 +154,22 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-cyclicHierarchyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
public final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface C : <ERROR TYPE REF: Loop in supertype: /C -> /B> {
public final? [ResolvedTo(SUPER_TYPES)] interface C : <ERROR TYPE REF: Loop in supertype: /C -> /B> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface D : <ERROR TYPE REF: Loop in supertype: /D -> /B> {
public final? [ResolvedTo(SUPER_TYPES)] interface D : <ERROR TYPE REF: Loop in supertype: /D -> /B> {
}
public abstract [ResolvedTo(STATUS)] interface ResolveMe : <ERROR TYPE REF: Loop in supertype: /ResolveMe -> /F> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D>, <ERROR TYPE REF: Loop in supertype: /F -> /C> {
public final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D>, <ERROR TYPE REF: Loop in supertype: /F -> /C> {
}
public? final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
public final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
}
@@ -179,22 +179,22 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-cyclicHierarchyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
public final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface C : <ERROR TYPE REF: Loop in supertype: /C -> /B> {
public final? [ResolvedTo(SUPER_TYPES)] interface C : <ERROR TYPE REF: Loop in supertype: /C -> /B> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface D : <ERROR TYPE REF: Loop in supertype: /D -> /B> {
public final? [ResolvedTo(SUPER_TYPES)] interface D : <ERROR TYPE REF: Loop in supertype: /D -> /B> {
}
public abstract [ResolvedTo(EXPECT_ACTUAL_MATCHING)] interface ResolveMe : <ERROR TYPE REF: Loop in supertype: /ResolveMe -> /F> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D>, <ERROR TYPE REF: Loop in supertype: /F -> /C> {
public final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D>, <ERROR TYPE REF: Loop in supertype: /F -> /C> {
}
public? final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
public final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
}
@@ -204,22 +204,22 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchyScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-cyclicHierarchyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
public final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface C : <ERROR TYPE REF: Loop in supertype: /C -> /B> {
public final? [ResolvedTo(SUPER_TYPES)] interface C : <ERROR TYPE REF: Loop in supertype: /C -> /B> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface D : <ERROR TYPE REF: Loop in supertype: /D -> /B> {
public final? [ResolvedTo(SUPER_TYPES)] interface D : <ERROR TYPE REF: Loop in supertype: /D -> /B> {
}
public abstract [ResolvedTo(CONTRACTS)] interface ResolveMe : <ERROR TYPE REF: Loop in supertype: /ResolveMe -> /F> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D>, <ERROR TYPE REF: Loop in supertype: /F -> /C> {
public final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D>, <ERROR TYPE REF: Loop in supertype: /F -> /C> {
}
public? final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
public final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
}
@@ -229,22 +229,22 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchyScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-cyclicHierarchyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
public final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface C : <ERROR TYPE REF: Loop in supertype: /C -> /B> {
public final? [ResolvedTo(SUPER_TYPES)] interface C : <ERROR TYPE REF: Loop in supertype: /C -> /B> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface D : <ERROR TYPE REF: Loop in supertype: /D -> /B> {
public final? [ResolvedTo(SUPER_TYPES)] interface D : <ERROR TYPE REF: Loop in supertype: /D -> /B> {
}
public abstract [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] interface ResolveMe : <ERROR TYPE REF: Loop in supertype: /ResolveMe -> /F> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D>, <ERROR TYPE REF: Loop in supertype: /F -> /C> {
public final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D>, <ERROR TYPE REF: Loop in supertype: /F -> /C> {
}
public? final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
public final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
}
@@ -254,22 +254,22 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchyScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-cyclicHierarchyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
public final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface C : <ERROR TYPE REF: Loop in supertype: /C -> /B> {
public final? [ResolvedTo(SUPER_TYPES)] interface C : <ERROR TYPE REF: Loop in supertype: /C -> /B> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface D : <ERROR TYPE REF: Loop in supertype: /D -> /B> {
public final? [ResolvedTo(SUPER_TYPES)] interface D : <ERROR TYPE REF: Loop in supertype: /D -> /B> {
}
public abstract [ResolvedTo(ANNOTATION_ARGUMENTS)] interface ResolveMe : <ERROR TYPE REF: Loop in supertype: /ResolveMe -> /F> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D>, <ERROR TYPE REF: Loop in supertype: /F -> /C> {
public final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D>, <ERROR TYPE REF: Loop in supertype: /F -> /C> {
}
public? final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
public final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
}
@@ -279,22 +279,22 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchyScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-cyclicHierarchyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
public final? [ResolvedTo(SUPER_TYPES)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface C : <ERROR TYPE REF: Loop in supertype: /C -> /B> {
public final? [ResolvedTo(SUPER_TYPES)] interface C : <ERROR TYPE REF: Loop in supertype: /C -> /B> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface D : <ERROR TYPE REF: Loop in supertype: /D -> /B> {
public final? [ResolvedTo(SUPER_TYPES)] interface D : <ERROR TYPE REF: Loop in supertype: /D -> /B> {
}
public abstract [ResolvedTo(BODY_RESOLVE)] interface ResolveMe : <ERROR TYPE REF: Loop in supertype: /ResolveMe -> /F> {
}
public? final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D>, <ERROR TYPE REF: Loop in supertype: /F -> /C> {
public final? [ResolvedTo(SUPER_TYPES)] interface F : <ERROR TYPE REF: Loop in supertype: /F -> /D>, <ERROR TYPE REF: Loop in supertype: /F -> /C> {
}
public? final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
public final? [ResolvedTo(RAW_FIR)] interface NonLoopedInterface : C {
}
@@ -321,3 +321,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] cyclicHierarchyScript.kts
public abstract [ResolvedTo(BODY_RESOLVE)] interface NonLoopedInterface : R|C| {
}