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/dataComponent2Script.txt
Vendored
+6 -6
View File
@@ -4,7 +4,7 @@ FILE: [ResolvedTo(RAW_FIR)] dataComponent2Script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-dataComponent2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
public final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -30,7 +30,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-dataComponent2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
public final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -56,7 +56,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-dataComponent2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class DataClass : R|kotlin/Any| {
public final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class DataClass : R|kotlin/Any| {
public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -82,7 +82,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-dataComponent2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? data [ResolvedTo(COMPANION_GENERATION)] class DataClass : R|kotlin/Any| {
public final? data [ResolvedTo(COMPANION_GENERATION)] class DataClass : R|kotlin/Any| {
public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=DataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -108,7 +108,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-dataComponent2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? data [ResolvedTo(SUPER_TYPES)] class DataClass : R|kotlin/Any| {
public final? data [ResolvedTo(SUPER_TYPES)] class DataClass : R|kotlin/Any| {
public? [ResolvedTo(SUPER_TYPES)] [ContainingClassKey=DataClass] constructor([ResolvedTo(SUPER_TYPES)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(SUPER_TYPES)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -134,7 +134,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-dataComponent2Script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? data [ResolvedTo(TYPES)] class DataClass : R|kotlin/Any| {
public final? data [ResolvedTo(TYPES)] class DataClass : R|kotlin/Any| {
public? [ResolvedTo(TYPES)] [ContainingClassKey=DataClass] constructor([ResolvedTo(TYPES)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(TYPES)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
LAZY_super<R|kotlin/Any|>
}