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/classes/compilerRequiredAnnotationConflict2.txt
Vendored
+12 -12
View File
@@ -1,11 +1,11 @@
RAW_FIR:
FILE: [ResolvedTo(RAW_FIR)] compilerRequiredAnnotationConflict2.kt
public? final? [ResolvedTo(RAW_FIR)] object Some : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] object Some : R|kotlin/Any| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Some] constructor(): R|Some| {
LAZY_super<R|kotlin/Any|>
}
@Target[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Ann : R|kotlin/Annotation| {
@Target[Unresolved](LAZY_EXPRESSION) public final? [ResolvedTo(RAW_FIR)] annotation class Ann : R|kotlin/Annotation| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Ann] constructor(): R|Some.Ann| {
LAZY_super<R|kotlin/Any|>
}
@@ -19,12 +19,12 @@ FILE: [ResolvedTo(RAW_FIR)] compilerRequiredAnnotationConflict2.kt
IMPORTS:
FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationConflict2.kt
public? final? [ResolvedTo(RAW_FIR)] object Some : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] object Some : R|kotlin/Any| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Some] constructor(): R|Some| {
LAZY_super<R|kotlin/Any|>
}
@Target[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Ann : R|kotlin/Annotation| {
@Target[Unresolved](LAZY_EXPRESSION) public final? [ResolvedTo(RAW_FIR)] annotation class Ann : R|kotlin/Annotation| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Ann] constructor(): R|Some.Ann| {
LAZY_super<R|kotlin/Any|>
}
@@ -38,12 +38,12 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationConflict2.kt
COMPILER_REQUIRED_ANNOTATIONS:
FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationConflict2.kt
public? final? [ResolvedTo(RAW_FIR)] object Some : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] object Some : R|kotlin/Any| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Some] constructor(): R|Some| {
LAZY_super<R|kotlin/Any|>
}
@R|kotlin/annotation/Target|[CompilerRequiredAnnotations](R|kotlin/annotation/AnnotationTarget.FIELD|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Ann : R|kotlin/Annotation| {
@R|kotlin/annotation/Target|[CompilerRequiredAnnotations](R|kotlin/annotation/AnnotationTarget.FIELD|) public final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Ann : R|kotlin/Annotation| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Ann] constructor(): R|Some.Ann| {
LAZY_super<R|kotlin/Any|>
}
@@ -57,12 +57,12 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationConflict2.kt
COMPANION_GENERATION:
FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationConflict2.kt
public? final? [ResolvedTo(RAW_FIR)] object Some : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] object Some : R|kotlin/Any| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Some] constructor(): R|Some| {
LAZY_super<R|kotlin/Any|>
}
@R|kotlin/annotation/Target|[CompilerRequiredAnnotations](R|kotlin/annotation/AnnotationTarget.FIELD|) public? final? [ResolvedTo(COMPANION_GENERATION)] annotation class Ann : R|kotlin/Annotation| {
@R|kotlin/annotation/Target|[CompilerRequiredAnnotations](R|kotlin/annotation/AnnotationTarget.FIELD|) public final? [ResolvedTo(COMPANION_GENERATION)] annotation class Ann : R|kotlin/Annotation| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Ann] constructor(): R|Some.Ann| {
LAZY_super<R|kotlin/Any|>
}
@@ -76,12 +76,12 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationConflict2.kt
SUPER_TYPES:
FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationConflict2.kt
public? final? [ResolvedTo(SUPER_TYPES)] object Some : R|kotlin/Any| {
public final? [ResolvedTo(SUPER_TYPES)] object Some : R|kotlin/Any| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Some] constructor(): R|Some| {
LAZY_super<R|kotlin/Any|>
}
@R|kotlin/annotation/Target|[CompilerRequiredAnnotations](R|kotlin/annotation/AnnotationTarget.FIELD|) public? final? [ResolvedTo(SUPER_TYPES)] annotation class Ann : R|kotlin/Annotation| {
@R|kotlin/annotation/Target|[CompilerRequiredAnnotations](R|kotlin/annotation/AnnotationTarget.FIELD|) public final? [ResolvedTo(SUPER_TYPES)] annotation class Ann : R|kotlin/Annotation| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Ann] constructor(): R|Some.Ann| {
LAZY_super<R|kotlin/Any|>
}
@@ -95,12 +95,12 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationConflict2.kt
TYPES:
FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationConflict2.kt
public? final? [ResolvedTo(TYPES)] object Some : R|kotlin/Any| {
public final? [ResolvedTo(TYPES)] object Some : R|kotlin/Any| {
private [ResolvedTo(RAW_FIR)] [ContainingClassKey=Some] constructor(): R|Some| {
LAZY_super<R|kotlin/Any|>
}
@R|kotlin/annotation/Target|[Types](R|kotlin/annotation/AnnotationTarget.FIELD|) public? final? [ResolvedTo(TYPES)] annotation class Ann : R|kotlin/Annotation| {
@R|kotlin/annotation/Target|[Types](R|kotlin/annotation/AnnotationTarget.FIELD|) public final? [ResolvedTo(TYPES)] annotation class Ann : R|kotlin/Annotation| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Ann] constructor(): R|Some.Ann| {
LAZY_super<R|kotlin/Any|>
}