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/lazyPropertyScript.txt
Vendored
+17 -17
View File
@@ -4,7 +4,7 @@ FILE: [ResolvedTo(RAW_FIR)] lazyPropertyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-lazyPropertyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
LAZY_super<R|kotlin/Any|>
}
@@ -22,7 +22,7 @@ FILE: [ResolvedTo(RAW_FIR)] lazyPropertyScript.kts
public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q { LAZY_BLOCK }
public? final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] constructor(): R|Test| {
LAZY_super<R|kotlin/Any|>
}
@@ -39,7 +39,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-lazyPropertyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
LAZY_super<R|kotlin/Any|>
}
@@ -57,7 +57,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q { LAZY_BLOCK }
public? final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] constructor(): R|Test| {
LAZY_super<R|kotlin/Any|>
}
@@ -74,7 +74,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-lazyPropertyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
LAZY_super<R|kotlin/Any|>
}
@@ -92,7 +92,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q { LAZY_BLOCK }
public? final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] constructor(): R|Test| {
LAZY_super<R|kotlin/Any|>
}
@@ -109,7 +109,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-lazyPropertyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
LAZY_super<R|kotlin/Any|>
}
@@ -127,7 +127,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q { LAZY_BLOCK }
public? final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Test : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] constructor(): R|Test| {
LAZY_super<R|kotlin/Any|>
}
@@ -144,7 +144,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-lazyPropertyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
LAZY_super<R|kotlin/Any|>
}
@@ -162,7 +162,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q { LAZY_BLOCK }
public? final? [ResolvedTo(SUPER_TYPES)] class Test : R|kotlin/Any| {
public final? [ResolvedTo(SUPER_TYPES)] class Test : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] constructor(): R|Test| {
LAZY_super<R|kotlin/Any|>
}
@@ -179,7 +179,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-lazyPropertyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
LAZY_super<R|kotlin/Any|>
}
@@ -197,7 +197,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] Q> materialize(): Q { LAZY_BLOCK }
public? final? [ResolvedTo(TYPES)] class Test : R|kotlin/Any| {
public final? [ResolvedTo(TYPES)] class Test : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Test] constructor(): R|Test| {
LAZY_super<R|kotlin/Any|>
}
@@ -214,7 +214,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-lazyPropertyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
LAZY_super<R|kotlin/Any|>
}
@@ -249,7 +249,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-lazyPropertyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
LAZY_super<R|kotlin/Any|>
}
@@ -284,7 +284,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-lazyPropertyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
LAZY_super<R|kotlin/Any|>
}
@@ -319,7 +319,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-lazyPropertyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
LAZY_super<R|kotlin/Any|>
}
@@ -354,7 +354,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-lazyPropertyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate<T>| {
LAZY_super<R|kotlin/Any|>
}