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/classes/nestedClassScript.txt
Vendored
+29 -28
View File
@@ -4,26 +4,26 @@ FILE: [ResolvedTo(RAW_FIR)] nestedClassScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-nestedClassScript.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|>
}
}
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>
}
}
public? final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
public final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
LAZY_super<AnotherTopLevelClass>
}
public? final? [ResolvedTo(RAW_FIR)] class NestedClass : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class NestedClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -39,26 +39,26 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-nestedClassScript.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|>
}
}
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>
}
}
public? final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
public final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
LAZY_super<AnotherTopLevelClass>
}
public? final? [ResolvedTo(RAW_FIR)] class NestedClass : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class NestedClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -74,26 +74,26 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-nestedClassScript.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|>
}
}
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>
}
}
public? final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
public final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
LAZY_super<AnotherTopLevelClass>
}
public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class NestedClass : R|kotlin/Any| {
public final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class NestedClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -109,26 +109,26 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-nestedClassScript.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|>
}
}
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>
}
}
public? final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
public final? [ResolvedTo(RAW_FIR)] class OuterClass : AnotherTopLevelClass {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
LAZY_super<AnotherTopLevelClass>
}
public? final? [ResolvedTo(COMPANION_GENERATION)] class NestedClass : R|kotlin/Any| {
public final? [ResolvedTo(COMPANION_GENERATION)] class NestedClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -144,26 +144,26 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-nestedClassScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(SUPER_TYPES)] class TopLevelClass : R|kotlin/Any| {
public open [ResolvedTo(SUPER_TYPES)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
}
}
public? open [ResolvedTo(SUPER_TYPES)] class AnotherTopLevelClass : R|TopLevelClass| {
public open [ResolvedTo(SUPER_TYPES)] class AnotherTopLevelClass : R|TopLevelClass| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
LAZY_super<TopLevelClass>
}
}
public? final? [ResolvedTo(SUPER_TYPES)] class OuterClass : R|AnotherTopLevelClass| {
public final? [ResolvedTo(SUPER_TYPES)] class OuterClass : R|AnotherTopLevelClass| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
LAZY_super<AnotherTopLevelClass>
}
public? final? [ResolvedTo(SUPER_TYPES)] class NestedClass : R|kotlin/Any| {
public final? [ResolvedTo(SUPER_TYPES)] class NestedClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -179,26 +179,26 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-nestedClassScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(SUPER_TYPES)] class TopLevelClass : R|kotlin/Any| {
public open [ResolvedTo(SUPER_TYPES)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
}
}
public? open [ResolvedTo(SUPER_TYPES)] class AnotherTopLevelClass : R|TopLevelClass| {
public open [ResolvedTo(SUPER_TYPES)] class AnotherTopLevelClass : R|TopLevelClass| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
LAZY_super<TopLevelClass>
}
}
public? final? [ResolvedTo(TYPES)] class OuterClass : R|AnotherTopLevelClass| {
public final? [ResolvedTo(TYPES)] class OuterClass : R|AnotherTopLevelClass| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor(): R|OuterClass| {
LAZY_super<AnotherTopLevelClass>
}
public? final? [ResolvedTo(TYPES)] class NestedClass : R|kotlin/Any| {
public final? [ResolvedTo(TYPES)] class NestedClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] constructor(): R|OuterClass.NestedClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -214,14 +214,14 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-nestedClassScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(SUPER_TYPES)] class TopLevelClass : R|kotlin/Any| {
public open [ResolvedTo(SUPER_TYPES)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
}
}
public? open [ResolvedTo(SUPER_TYPES)] class AnotherTopLevelClass : R|TopLevelClass| {
public open [ResolvedTo(SUPER_TYPES)] class AnotherTopLevelClass : R|TopLevelClass| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
LAZY_super<TopLevelClass>
}
@@ -249,14 +249,14 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-nestedClassScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? open [ResolvedTo(SUPER_TYPES)] class TopLevelClass : R|kotlin/Any| {
public open [ResolvedTo(SUPER_TYPES)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
}
}
public? open [ResolvedTo(SUPER_TYPES)] class AnotherTopLevelClass : R|TopLevelClass| {
public open [ResolvedTo(SUPER_TYPES)] class AnotherTopLevelClass : R|TopLevelClass| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherTopLevelClass] constructor(): R|AnotherTopLevelClass| {
LAZY_super<TopLevelClass>
}
@@ -451,3 +451,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] nestedClassScript.kts
}
}