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/localNestedClassScript.txt
Vendored
+23 -22
View File
@@ -4,7 +4,7 @@ FILE: [ResolvedTo(RAW_FIR)] localNestedClassScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-localNestedClassScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -15,7 +15,7 @@ FILE: [ResolvedTo(RAW_FIR)] localNestedClassScript.kts
}
public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
LAZY_super<TopLevelClass>
}
@@ -33,7 +33,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-localNestedClassScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -44,7 +44,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
}
public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
LAZY_super<TopLevelClass>
}
@@ -62,7 +62,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-localNestedClassScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -73,7 +73,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
}
public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
LAZY_super<TopLevelClass>
}
@@ -91,7 +91,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-localNestedClassScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -102,7 +102,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
}
public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
LAZY_super<TopLevelClass>
}
@@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-localNestedClassScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -131,7 +131,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
}
public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
LAZY_super<TopLevelClass>
}
@@ -149,7 +149,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-localNestedClassScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
}
public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
LAZY_super<TopLevelClass>
}
@@ -178,7 +178,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-localNestedClassScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -189,7 +189,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
}
public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
LAZY_super<TopLevelClass>
}
@@ -207,7 +207,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-localNestedClassScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -218,7 +218,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
}
public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
LAZY_super<TopLevelClass>
}
@@ -236,7 +236,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-localNestedClassScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -247,7 +247,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
}
public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
LAZY_super<TopLevelClass>
}
@@ -283,7 +283,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-localNestedClassScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -294,7 +294,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
}
public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
LAZY_super<TopLevelClass>
}
@@ -330,7 +330,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-localNestedClassScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -341,7 +341,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
}
public? open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public open [ResolvedTo(RAW_FIR)] class AnotherTopLevelClass : TopLevelClass {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
LAZY_super<TopLevelClass>
}
@@ -466,3 +466,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] localNestedClassScript.kts
}
}