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/script4.txt
Vendored
+10 -9
View File
@@ -4,7 +4,7 @@ FILE: [ResolvedTo(RAW_FIR)] script4.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-script4.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|>
}
@@ -30,7 +30,7 @@ FILE: [ResolvedTo(IMPORTS)] script4.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-script4.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|>
}
@@ -56,7 +56,7 @@ FILE: [ResolvedTo(IMPORTS)] script4.kts
SCRIPT: [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] <script-script4.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|>
}
@@ -82,7 +82,7 @@ FILE: [ResolvedTo(IMPORTS)] script4.kts
SCRIPT: [ResolvedTo(COMPANION_GENERATION)] <script-script4.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|>
}
@@ -108,7 +108,7 @@ FILE: [ResolvedTo(IMPORTS)] script4.kts
SCRIPT: [ResolvedTo(SUPER_TYPES)] <script-script4.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|>
}
@@ -134,7 +134,7 @@ FILE: [ResolvedTo(IMPORTS)] script4.kts
SCRIPT: [ResolvedTo(TYPES)] <script-script4.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|>
}
@@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] script4.kts
SCRIPT: [ResolvedTo(STATUS)] <script-script4.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|>
}
@@ -186,7 +186,7 @@ FILE: [ResolvedTo(IMPORTS)] script4.kts
SCRIPT: [ResolvedTo(EXPECT_ACTUAL_MATCHING)] <script-script4.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|>
}
@@ -212,7 +212,7 @@ FILE: [ResolvedTo(IMPORTS)] script4.kts
SCRIPT: [ResolvedTo(CONTRACTS)] <script-script4.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|>
}
@@ -354,3 +354,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] script4.kts
public final [ResolvedTo(BODY_RESOLVE)] val $$result: <ERROR TYPE REF: Unresolved name: execute> = @R|kotlin/Suppress|[Types](names = vararg(String(abc))) @R|kotlin/Deprecated|[Types](message = String(it is deprecated)) R|/builder|.<Unresolved name: execute>#()
public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: execute>