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/redeclaration.txt
Vendored
+14 -14
View File
@@ -1,12 +1,12 @@
RAW_FIR:
FILE: [ResolvedTo(RAW_FIR)] redeclaration.kt
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
LAZY_super<R|kotlin/Any|>
}
@@ -15,13 +15,13 @@ FILE: [ResolvedTo(RAW_FIR)] redeclaration.kt
IMPORTS:
FILE: [ResolvedTo(IMPORTS)] redeclaration.kt
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
LAZY_super<R|kotlin/Any|>
}
@@ -30,13 +30,13 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt
COMPILER_REQUIRED_ANNOTATIONS:
FILE: [ResolvedTo(IMPORTS)] redeclaration.kt
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class A : R|kotlin/Any| {
public final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class A : R|kotlin/Any| {
public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=A] constructor(): R|A| {
LAZY_super<R|kotlin/Any|>
}
@@ -45,13 +45,13 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt
COMPANION_GENERATION:
FILE: [ResolvedTo(IMPORTS)] redeclaration.kt
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? [ResolvedTo(COMPANION_GENERATION)] class A : R|kotlin/Any| {
public final? [ResolvedTo(COMPANION_GENERATION)] class A : R|kotlin/Any| {
public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=A] constructor(): R|A| {
LAZY_super<R|kotlin/Any|>
}
@@ -60,13 +60,13 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt
SUPER_TYPES:
FILE: [ResolvedTo(IMPORTS)] redeclaration.kt
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? [ResolvedTo(SUPER_TYPES)] class A : R|kotlin/Any| {
public final? [ResolvedTo(SUPER_TYPES)] class A : R|kotlin/Any| {
public? [ResolvedTo(SUPER_TYPES)] [ContainingClassKey=A] constructor(): R|A| {
LAZY_super<R|kotlin/Any|>
}
@@ -75,13 +75,13 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt
TYPES:
FILE: [ResolvedTo(IMPORTS)] redeclaration.kt
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? [ResolvedTo(TYPES)] class A : R|kotlin/Any| {
public final? [ResolvedTo(TYPES)] class A : R|kotlin/Any| {
public? [ResolvedTo(TYPES)] [ContainingClassKey=A] constructor(): R|A| {
LAZY_super<R|kotlin/Any|>
}
@@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt
STATUS:
FILE: [ResolvedTo(IMPORTS)] redeclaration.kt
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
LAZY_super<R|kotlin/Any|>
}
@@ -105,7 +105,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt
EXPECT_ACTUAL_MATCHING:
FILE: [ResolvedTo(IMPORTS)] redeclaration.kt
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
LAZY_super<R|kotlin/Any|>
}