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/nestedClassWithPropertiesOverrides.txt
Vendored
+24 -24
View File
@@ -1,10 +1,10 @@
RAW_FIR:
FILE: [ResolvedTo(RAW_FIR)] nestedClassWithPropertiesOverrides.kt
public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
public? final? [ResolvedTo(RAW_FIR)] class ResolveMe : OV {
public final? [ResolvedTo(RAW_FIR)] class ResolveMe : OV {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
LAZY_super<<implicit>>
}
@@ -15,7 +15,7 @@ FILE: [ResolvedTo(RAW_FIR)] nestedClassWithPropertiesOverrides.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|>
}
@@ -24,11 +24,11 @@ FILE: [ResolvedTo(RAW_FIR)] nestedClassWithPropertiesOverrides.kt
IMPORTS:
FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
public? final? [ResolvedTo(RAW_FIR)] class ResolveMe : OV {
public final? [ResolvedTo(RAW_FIR)] class ResolveMe : OV {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
LAZY_super<<implicit>>
}
@@ -39,7 +39,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.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|>
}
@@ -48,11 +48,11 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
COMPILER_REQUIRED_ANNOTATIONS:
FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class ResolveMe : OV {
public final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class ResolveMe : OV {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
LAZY_super<<implicit>>
}
@@ -63,7 +63,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.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|>
}
@@ -72,11 +72,11 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
COMPANION_GENERATION:
FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
public? final? [ResolvedTo(COMPANION_GENERATION)] class ResolveMe : OV {
public final? [ResolvedTo(COMPANION_GENERATION)] class ResolveMe : OV {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
LAZY_super<<implicit>>
}
@@ -87,7 +87,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.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|>
}
@@ -96,11 +96,11 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
SUPER_TYPES:
FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
public? final? [ResolvedTo(SUPER_TYPES)] interface OV : R|kotlin/Any| {
public final? [ResolvedTo(SUPER_TYPES)] interface OV : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
public? final? [ResolvedTo(SUPER_TYPES)] class ResolveMe : R|OV| {
public final? [ResolvedTo(SUPER_TYPES)] class ResolveMe : R|OV| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
LAZY_super<<implicit>>
}
@@ -111,7 +111,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.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|>
}
@@ -120,11 +120,11 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
TYPES:
FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
public? final? [ResolvedTo(TYPES)] interface OV : R|kotlin/Any| {
public final? [ResolvedTo(TYPES)] interface OV : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
public? final? [ResolvedTo(TYPES)] class ResolveMe : R|OV| {
public final? [ResolvedTo(TYPES)] class ResolveMe : R|OV| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
LAZY_super<<implicit>>
}
@@ -135,7 +135,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.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|>
}
@@ -159,7 +159,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.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|>
}
@@ -183,7 +183,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.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|>
}
@@ -207,7 +207,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.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|>
}
@@ -231,7 +231,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.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|>
}
@@ -255,7 +255,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.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|>
}
@@ -279,7 +279,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.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|>
}