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/script.txt
Vendored
+33 -33
View File
@@ -4,7 +4,7 @@ FILE: [ResolvedTo(RAW_FIR)] script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
LAZY_super<R|kotlin/Any|>
}
@@ -17,7 +17,7 @@ FILE: [ResolvedTo(RAW_FIR)] script.kts
}
public? final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
public final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] constructor(): R|En| {
LAZY_super<R|kotlin/Enum<En>|>
}
@@ -34,7 +34,7 @@ FILE: [ResolvedTo(RAW_FIR)] script.kts
}
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: En): R|Anno| {
LAZY_super<R|kotlin/Any|>
}
@@ -64,7 +64,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
LAZY_super<R|kotlin/Any|>
}
@@ -77,7 +77,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
}
public? final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
public final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] constructor(): R|En| {
LAZY_super<R|kotlin/Enum<En>|>
}
@@ -94,7 +94,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
}
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: En): R|Anno| {
LAZY_super<R|kotlin/Any|>
}
@@ -124,7 +124,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
SCRIPT: [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] <script-script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
LAZY_super<R|kotlin/Any|>
}
@@ -137,7 +137,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
}
public? final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
public final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] constructor(): R|En| {
LAZY_super<R|kotlin/Enum<En>|>
}
@@ -154,7 +154,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
}
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: En): R|Anno| {
LAZY_super<R|kotlin/Any|>
}
@@ -184,7 +184,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
SCRIPT: [ResolvedTo(COMPANION_GENERATION)] <script-script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
LAZY_super<R|kotlin/Any|>
}
@@ -197,7 +197,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
}
public? final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
public final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] constructor(): R|En| {
LAZY_super<R|kotlin/Enum<En>|>
}
@@ -214,7 +214,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
}
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: En): R|Anno| {
LAZY_super<R|kotlin/Any|>
}
@@ -244,7 +244,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
SCRIPT: [ResolvedTo(SUPER_TYPES)] <script-script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
LAZY_super<R|kotlin/Any|>
}
@@ -257,7 +257,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
}
public? final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
public final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] constructor(): R|En| {
LAZY_super<R|kotlin/Enum<En>|>
}
@@ -274,7 +274,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
}
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: En): R|Anno| {
LAZY_super<R|kotlin/Any|>
}
@@ -304,7 +304,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
SCRIPT: [ResolvedTo(TYPES)] <script-script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
LAZY_super<R|kotlin/Any|>
}
@@ -317,7 +317,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
}
public? final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
public final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] constructor(): R|En| {
LAZY_super<R|kotlin/Enum<En>|>
}
@@ -334,7 +334,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
}
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: En): R|Anno| {
LAZY_super<R|kotlin/Any|>
}
@@ -364,7 +364,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
SCRIPT: [ResolvedTo(STATUS)] <script-script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
LAZY_super<R|kotlin/Any|>
}
@@ -377,7 +377,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
}
public? final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
public final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] constructor(): R|En| {
LAZY_super<R|kotlin/Enum<En>|>
}
@@ -394,7 +394,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
}
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: En): R|Anno| {
LAZY_super<R|kotlin/Any|>
}
@@ -424,7 +424,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
SCRIPT: [ResolvedTo(EXPECT_ACTUAL_MATCHING)] <script-script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
LAZY_super<R|kotlin/Any|>
}
@@ -437,7 +437,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
}
public? final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
public final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] constructor(): R|En| {
LAZY_super<R|kotlin/Enum<En>|>
}
@@ -454,7 +454,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
}
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: En): R|Anno| {
LAZY_super<R|kotlin/Any|>
}
@@ -484,7 +484,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
SCRIPT: [ResolvedTo(CONTRACTS)] <script-script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
LAZY_super<R|kotlin/Any|>
}
@@ -497,7 +497,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
}
public? final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
public final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] constructor(): R|En| {
LAZY_super<R|kotlin/Enum<En>|>
}
@@ -514,7 +514,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
}
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: En): R|Anno| {
LAZY_super<R|kotlin/Any|>
}
@@ -544,7 +544,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
SCRIPT: [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] <script-script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
LAZY_super<R|kotlin/Any|>
}
@@ -557,7 +557,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
}
public? final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
public final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] constructor(): R|En| {
LAZY_super<R|kotlin/Enum<En>|>
}
@@ -574,7 +574,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
}
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: En): R|Anno| {
LAZY_super<R|kotlin/Any|>
}
@@ -604,7 +604,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
SCRIPT: [ResolvedTo(ANNOTATION_ARGUMENTS)] <script-script.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
LAZY_super<R|kotlin/Any|>
}
@@ -617,7 +617,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
}
public? final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
public final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] constructor(): R|En| {
LAZY_super<R|kotlin/Enum<En>|>
}
@@ -634,7 +634,7 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
}
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
@Target[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION) @Retention[Unresolved](LAZY_EXPRESSION) public final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: En): R|Anno| {
LAZY_super<R|kotlin/Any|>
}