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/properties/hierarchyWithOverrideScript.txt
Vendored
+19 -18
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>>
}
@@ -43,7 +43,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|
@@ -53,7 +53,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|
@@ -63,7 +63,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>>
}
@@ -82,7 +82,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|
@@ -92,7 +92,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|
@@ -102,7 +102,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>>
}
@@ -121,7 +121,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|
@@ -131,7 +131,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|
@@ -141,7 +141,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>>
}
@@ -160,7 +160,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|
@@ -170,7 +170,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|
@@ -180,7 +180,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>>
}
@@ -199,7 +199,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|
@@ -209,7 +209,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|
@@ -219,7 +219,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>>
}
@@ -504,3 +504,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] hierarchyWithOverrideScript.kts
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Usage] get(): R|kotlin/String|
}