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/propertyWithWhere.txt
Vendored
+18 -18
View File
@@ -1,80 +1,80 @@
RAW_FIR:
FILE: [ResolvedTo(RAW_FIR)] propertyWithWhere.kt
public? final? [ResolvedTo(RAW_FIR)] interface One : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface One : R|kotlin/Any| {
}
public? final? [ResolvedTo(RAW_FIR)] interface Two : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Two : R|kotlin/Any| {
}
public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : One, Two> T.foo: <implicit>
public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
IMPORTS:
FILE: [ResolvedTo(IMPORTS)] propertyWithWhere.kt
public? final? [ResolvedTo(RAW_FIR)] interface One : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface One : R|kotlin/Any| {
}
public? final? [ResolvedTo(RAW_FIR)] interface Two : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Two : R|kotlin/Any| {
}
public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : One, Two> T.foo: <implicit>
public? [ResolvedTo(RAW_FIR)] get(): <implicit> { LAZY_BLOCK }
COMPILER_REQUIRED_ANNOTATIONS:
FILE: [ResolvedTo(IMPORTS)] propertyWithWhere.kt
public? final? [ResolvedTo(RAW_FIR)] interface One : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface One : R|kotlin/Any| {
}
public? final? [ResolvedTo(RAW_FIR)] interface Two : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Two : R|kotlin/Any| {
}
public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] val <[ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] T : One, Two> T.foo: <implicit>
public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): <implicit> { LAZY_BLOCK }
COMPANION_GENERATION:
FILE: [ResolvedTo(IMPORTS)] propertyWithWhere.kt
public? final? [ResolvedTo(RAW_FIR)] interface One : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface One : R|kotlin/Any| {
}
public? final? [ResolvedTo(RAW_FIR)] interface Two : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Two : R|kotlin/Any| {
}
public? final? [ResolvedTo(COMPANION_GENERATION)] val <[ResolvedTo(COMPANION_GENERATION)] T : One, Two> T.foo: <implicit>
public? [ResolvedTo(COMPANION_GENERATION)] get(): <implicit> { LAZY_BLOCK }
SUPER_TYPES:
FILE: [ResolvedTo(IMPORTS)] propertyWithWhere.kt
public? final? [ResolvedTo(RAW_FIR)] interface One : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface One : R|kotlin/Any| {
}
public? final? [ResolvedTo(RAW_FIR)] interface Two : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Two : R|kotlin/Any| {
}
public? final? [ResolvedTo(SUPER_TYPES)] val <[ResolvedTo(SUPER_TYPES)] T : One, Two> T.foo: <implicit>
public? [ResolvedTo(SUPER_TYPES)] get(): <implicit> { LAZY_BLOCK }
TYPES:
FILE: [ResolvedTo(IMPORTS)] propertyWithWhere.kt
public? final? [ResolvedTo(RAW_FIR)] interface One : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface One : R|kotlin/Any| {
}
public? final? [ResolvedTo(RAW_FIR)] interface Two : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Two : R|kotlin/Any| {
}
public? final? [ResolvedTo(TYPES)] val <[ResolvedTo(TYPES)] T : R|One|, R|Two|> R|T|.foo: <implicit>
public? [ResolvedTo(TYPES)] get(): <implicit> { LAZY_BLOCK }
STATUS:
FILE: [ResolvedTo(IMPORTS)] propertyWithWhere.kt
public? final? [ResolvedTo(RAW_FIR)] interface One : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface One : R|kotlin/Any| {
}
public? final? [ResolvedTo(RAW_FIR)] interface Two : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Two : R|kotlin/Any| {
}
public final [ResolvedTo(STATUS)] val <[ResolvedTo(STATUS)] T : R|One|, R|Two|> R|T|.foo: <implicit>
public [ResolvedTo(STATUS)] get(): <implicit> { LAZY_BLOCK }
EXPECT_ACTUAL_MATCHING:
FILE: [ResolvedTo(IMPORTS)] propertyWithWhere.kt
public? final? [ResolvedTo(RAW_FIR)] interface One : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface One : R|kotlin/Any| {
}
public? final? [ResolvedTo(RAW_FIR)] interface Two : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Two : R|kotlin/Any| {
}
public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val <[ResolvedTo(EXPECT_ACTUAL_MATCHING)] T : R|One|, R|Two|> R|T|.foo: <implicit>
public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <implicit> { LAZY_BLOCK }
CONTRACTS:
FILE: [ResolvedTo(IMPORTS)] propertyWithWhere.kt
public? final? [ResolvedTo(RAW_FIR)] interface One : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface One : R|kotlin/Any| {
}
public? final? [ResolvedTo(RAW_FIR)] interface Two : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Two : R|kotlin/Any| {
}
public final [ResolvedTo(CONTRACTS)] val <[ResolvedTo(CONTRACTS)] T : R|One|, R|Two|> R|T|.foo: <implicit>
public [ResolvedTo(CONTRACTS)] get(): <implicit> {