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/hierarchyWithOverrideScript.txt
Vendored
+29 -28
View File
@@ -4,7 +4,7 @@ FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-hierarchyWithOverrideScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
@@ -14,7 +14,7 @@ FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideScript.kts
}
public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
public final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
@@ -24,7 +24,7 @@ FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideScript.kts
}
public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
public abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
LAZY_super<<implicit>>
}
@@ -40,7 +40,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-hierarchyWithOverrideScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
@@ -50,7 +50,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
}
public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
public final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
@@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
}
public? abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
public abstract [ResolvedTo(RAW_FIR)] class Usage : Foo2 {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
LAZY_super<<implicit>>
}
@@ -76,7 +76,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-hierarchyWithOverrideScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
@@ -86,7 +86,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
}
public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
public final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
@@ -96,7 +96,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
}
public? abstract [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class Usage : Foo2 {
public abstract [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class Usage : Foo2 {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
LAZY_super<<implicit>>
}
@@ -112,7 +112,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-hierarchyWithOverrideScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
@@ -122,7 +122,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
}
public? final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
public final? [ResolvedTo(RAW_FIR)] interface Foo2 : Foo1 {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
@@ -132,7 +132,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
}
public? abstract [ResolvedTo(COMPANION_GENERATION)] class Usage : Foo2 {
public abstract [ResolvedTo(COMPANION_GENERATION)] class Usage : Foo2 {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
LAZY_super<<implicit>>
}
@@ -148,7 +148,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-hierarchyWithOverrideScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
@@ -158,7 +158,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : R|Foo1| {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : R|Foo1| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
@@ -168,7 +168,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
}
public? abstract [ResolvedTo(SUPER_TYPES)] class Usage : R|Foo2| {
public abstract [ResolvedTo(SUPER_TYPES)] class Usage : R|Foo2| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
LAZY_super<<implicit>>
}
@@ -184,7 +184,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-hierarchyWithOverrideScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
@@ -194,7 +194,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : R|Foo1| {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : R|Foo1| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
@@ -204,7 +204,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
}
public? abstract [ResolvedTo(TYPES)] class Usage : R|Foo2| {
public abstract [ResolvedTo(TYPES)] class Usage : R|Foo2| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor(): R|Usage| {
LAZY_super<<implicit>>
}
@@ -220,7 +220,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-hierarchyWithOverrideScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
@@ -230,7 +230,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : R|Foo1| {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : R|Foo1| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
@@ -256,7 +256,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-hierarchyWithOverrideScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
@@ -266,7 +266,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : R|Foo1| {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : R|Foo1| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
@@ -292,7 +292,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-hierarchyWithOverrideScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
@@ -302,7 +302,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : R|Foo1| {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : R|Foo1| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
@@ -328,7 +328,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-hierarchyWithOverrideScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
@@ -338,7 +338,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : R|Foo1| {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : R|Foo1| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
@@ -364,7 +364,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-hierarchyWithOverrideScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar(): R|kotlin/Unit|
@@ -374,7 +374,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : R|Foo1| {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo2 : R|Foo1| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit|
public? final? [ResolvedTo(RAW_FIR)] fun bar([ResolvedTo(RAW_FIR)] s: String): R|kotlin/Unit|
@@ -465,3 +465,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] hierarchyWithOverrideScript.kts
}
}