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/lambdaAsSAMInterfaceScript.txt
Vendored
+23 -23
View File
@@ -4,14 +4,14 @@ FILE: [ResolvedTo(RAW_FIR)] lambdaAsSAMInterfaceScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-lambdaAsSAMInterfaceScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
}
@@ -27,14 +27,14 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-lambdaAsSAMInterfaceScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
}
@@ -50,14 +50,14 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-lambdaAsSAMInterfaceScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
}
@@ -73,14 +73,14 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-lambdaAsSAMInterfaceScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
}
@@ -96,14 +96,14 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-lambdaAsSAMInterfaceScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
}
@@ -119,14 +119,14 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-lambdaAsSAMInterfaceScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
}
@@ -142,14 +142,14 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-lambdaAsSAMInterfaceScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
}
@@ -165,14 +165,14 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-lambdaAsSAMInterfaceScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
}
@@ -188,14 +188,14 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-lambdaAsSAMInterfaceScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
}
@@ -216,14 +216,14 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-lambdaAsSAMInterfaceScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
}
@@ -244,14 +244,14 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-lambdaAsSAMInterfaceScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public final? fun [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] a: Arg): Arg
}
@@ -272,7 +272,7 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-lambdaAsSAMInterfaceScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
LAZY_super<R|kotlin/Any|>
}