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/cyclicNestedHierarchy2Script.txt
Vendored
+29 -28
View File
@@ -4,12 +4,12 @@ FILE: [ResolvedTo(RAW_FIR)] cyclicNestedHierarchy2Script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-cyclicNestedHierarchy2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(RAW_FIR)] class C : D {
public open [ResolvedTo(RAW_FIR)] class C : D {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| {
LAZY_super<D>
}
public? open [ResolvedTo(RAW_FIR)] class CC : R|kotlin/Any| {
public open [ResolvedTo(RAW_FIR)] class CC : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=CC] constructor(): R|C.CC| {
LAZY_super<R|kotlin/Any|>
}
@@ -18,7 +18,7 @@ FILE: [ResolvedTo(RAW_FIR)] cyclicNestedHierarchy2Script.kts
}
public? open [ResolvedTo(RAW_FIR)] class D : C.CC {
public open [ResolvedTo(RAW_FIR)] class D : C.CC {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=D] constructor(): R|D| {
LAZY_super<C.CC>
}
@@ -32,12 +32,12 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2Script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-cyclicNestedHierarchy2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(RAW_FIR)] class C : D {
public open [ResolvedTo(RAW_FIR)] class C : D {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| {
LAZY_super<D>
}
public? open [ResolvedTo(RAW_FIR)] class CC : R|kotlin/Any| {
public open [ResolvedTo(RAW_FIR)] class CC : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=CC] constructor(): R|C.CC| {
LAZY_super<R|kotlin/Any|>
}
@@ -46,7 +46,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2Script.kts
}
public? open [ResolvedTo(RAW_FIR)] class D : C.CC {
public open [ResolvedTo(RAW_FIR)] class D : C.CC {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=D] constructor(): R|D| {
LAZY_super<C.CC>
}
@@ -60,12 +60,12 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2Script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-cyclicNestedHierarchy2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(RAW_FIR)] class C : D {
public open [ResolvedTo(RAW_FIR)] class C : D {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| {
LAZY_super<D>
}
public? open [ResolvedTo(RAW_FIR)] class CC : R|kotlin/Any| {
public open [ResolvedTo(RAW_FIR)] class CC : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=CC] constructor(): R|C.CC| {
LAZY_super<R|kotlin/Any|>
}
@@ -74,7 +74,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2Script.kts
}
public? open [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class D : C.CC {
public open [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class D : C.CC {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=D] constructor(): R|D| {
LAZY_super<C.CC>
}
@@ -88,12 +88,12 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2Script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-cyclicNestedHierarchy2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(RAW_FIR)] class C : D {
public open [ResolvedTo(RAW_FIR)] class C : D {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| {
LAZY_super<D>
}
public? open [ResolvedTo(RAW_FIR)] class CC : R|kotlin/Any| {
public open [ResolvedTo(RAW_FIR)] class CC : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=CC] constructor(): R|C.CC| {
LAZY_super<R|kotlin/Any|>
}
@@ -102,7 +102,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2Script.kts
}
public? open [ResolvedTo(COMPANION_GENERATION)] class D : C.CC {
public open [ResolvedTo(COMPANION_GENERATION)] class D : C.CC {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=D] constructor(): R|D| {
LAZY_super<C.CC>
}
@@ -116,12 +116,12 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2Script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-cyclicNestedHierarchy2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(SUPER_TYPES)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
public open [ResolvedTo(SUPER_TYPES)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| {
LAZY_super<D>
}
public? open [ResolvedTo(SUPER_TYPES)] class CC : <ERROR TYPE REF: Loop in supertype: /C.CC -> kotlin/Any> {
public open [ResolvedTo(SUPER_TYPES)] class CC : <ERROR TYPE REF: Loop in supertype: /C.CC -> kotlin/Any> {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=CC] constructor(): R|C.CC| {
LAZY_super<R|kotlin/Any|>
}
@@ -130,7 +130,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2Script.kts
}
public? open [ResolvedTo(SUPER_TYPES)] class D : <ERROR TYPE REF: Loop in supertype: /D -> /C.CC> {
public open [ResolvedTo(SUPER_TYPES)] class D : <ERROR TYPE REF: Loop in supertype: /D -> /C.CC> {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=D] constructor(): R|D| {
LAZY_super<C.CC>
}
@@ -144,12 +144,12 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2Script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-cyclicNestedHierarchy2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(SUPER_TYPES)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
public open [ResolvedTo(SUPER_TYPES)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| {
LAZY_super<D>
}
public? open [ResolvedTo(SUPER_TYPES)] class CC : <ERROR TYPE REF: Loop in supertype: /C.CC -> kotlin/Any> {
public open [ResolvedTo(SUPER_TYPES)] class CC : <ERROR TYPE REF: Loop in supertype: /C.CC -> kotlin/Any> {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=CC] constructor(): R|C.CC| {
LAZY_super<R|kotlin/Any|>
}
@@ -158,7 +158,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2Script.kts
}
public? open [ResolvedTo(TYPES)] class D : <ERROR TYPE REF: Loop in supertype: /D -> /C.CC> {
public open [ResolvedTo(TYPES)] class D : <ERROR TYPE REF: Loop in supertype: /D -> /C.CC> {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=D] constructor(): R|D| {
LAZY_super<C.CC>
}
@@ -172,12 +172,12 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2Script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-cyclicNestedHierarchy2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(SUPER_TYPES)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
public open [ResolvedTo(SUPER_TYPES)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| {
LAZY_super<D>
}
public? open [ResolvedTo(SUPER_TYPES)] class CC : <ERROR TYPE REF: Loop in supertype: /C.CC -> kotlin/Any> {
public open [ResolvedTo(SUPER_TYPES)] class CC : <ERROR TYPE REF: Loop in supertype: /C.CC -> kotlin/Any> {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=CC] constructor(): R|C.CC| {
LAZY_super<R|kotlin/Any|>
}
@@ -200,12 +200,12 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2Script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-cyclicNestedHierarchy2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(SUPER_TYPES)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
public open [ResolvedTo(SUPER_TYPES)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| {
LAZY_super<D>
}
public? open [ResolvedTo(SUPER_TYPES)] class CC : <ERROR TYPE REF: Loop in supertype: /C.CC -> kotlin/Any> {
public open [ResolvedTo(SUPER_TYPES)] class CC : <ERROR TYPE REF: Loop in supertype: /C.CC -> kotlin/Any> {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=CC] constructor(): R|C.CC| {
LAZY_super<R|kotlin/Any|>
}
@@ -228,12 +228,12 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2Script.kts
SCRIPT: [ResolvedTo(TYPES)] <script-cyclicNestedHierarchy2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(SUPER_TYPES)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
public open [ResolvedTo(SUPER_TYPES)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| {
LAZY_super<D>
}
public? open [ResolvedTo(SUPER_TYPES)] class CC : <ERROR TYPE REF: Loop in supertype: /C.CC -> kotlin/Any> {
public open [ResolvedTo(SUPER_TYPES)] class CC : <ERROR TYPE REF: Loop in supertype: /C.CC -> kotlin/Any> {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=CC] constructor(): R|C.CC| {
LAZY_super<R|kotlin/Any|>
}
@@ -256,12 +256,12 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2Script.kts
SCRIPT: [ResolvedTo(TYPES)] <script-cyclicNestedHierarchy2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(SUPER_TYPES)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
public open [ResolvedTo(SUPER_TYPES)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| {
LAZY_super<D>
}
public? open [ResolvedTo(SUPER_TYPES)] class CC : <ERROR TYPE REF: Loop in supertype: /C.CC -> kotlin/Any> {
public open [ResolvedTo(SUPER_TYPES)] class CC : <ERROR TYPE REF: Loop in supertype: /C.CC -> kotlin/Any> {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=CC] constructor(): R|C.CC| {
LAZY_super<R|kotlin/Any|>
}
@@ -284,12 +284,12 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2Script.kts
SCRIPT: [ResolvedTo(TYPES)] <script-cyclicNestedHierarchy2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(SUPER_TYPES)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
public open [ResolvedTo(SUPER_TYPES)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| {
LAZY_super<D>
}
public? open [ResolvedTo(SUPER_TYPES)] class CC : <ERROR TYPE REF: Loop in supertype: /C.CC -> kotlin/Any> {
public open [ResolvedTo(SUPER_TYPES)] class CC : <ERROR TYPE REF: Loop in supertype: /C.CC -> kotlin/Any> {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=CC] constructor(): R|C.CC| {
LAZY_super<R|kotlin/Any|>
}
@@ -360,3 +360,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] cyclicNestedHierarchy2Script.kts
}
}