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/errors/annotationWithNamedFunctionArgument.txt
Vendored
+6 -6
View File
@@ -1,6 +1,6 @@
RAW_FIR:
FILE: [ResolvedTo(RAW_FIR)] annotationWithNamedFunctionArgument.kt
@Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
@Anno[Unresolved](LAZY_EXPRESSION) public final? [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -9,7 +9,7 @@ FILE: [ResolvedTo(RAW_FIR)] annotationWithNamedFunctionArgument.kt
IMPORTS:
FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt
@Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
@Anno[Unresolved](LAZY_EXPRESSION) public final? [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt
COMPILER_REQUIRED_ANNOTATIONS:
FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt
@Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class TopLevelClass : R|kotlin/Any| {
@Anno[Unresolved](LAZY_EXPRESSION) public final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -27,7 +27,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt
COMPANION_GENERATION:
FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt
@Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPANION_GENERATION)] class TopLevelClass : R|kotlin/Any| {
@Anno[Unresolved](LAZY_EXPRESSION) public final? [ResolvedTo(COMPANION_GENERATION)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -36,7 +36,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt
SUPER_TYPES:
FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt
@Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(SUPER_TYPES)] class TopLevelClass : R|kotlin/Any| {
@Anno[Unresolved](LAZY_EXPRESSION) public final? [ResolvedTo(SUPER_TYPES)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -45,7 +45,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt
TYPES:
FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt
@<ERROR TYPE REF: Symbol not found for Anno>[Types](LAZY_EXPRESSION) public? final? [ResolvedTo(TYPES)] class TopLevelClass : R|kotlin/Any| {
@<ERROR TYPE REF: Symbol not found for Anno>[Types](LAZY_EXPRESSION) public final? [ResolvedTo(TYPES)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
}
analysis/low-level-api-fir/testData/lazyResolve/errors/anonymousObjectInInvalidPosition.txt
Vendored
+11 -11
View File
@@ -2,7 +2,7 @@ RAW_FIR:
FILE: [ResolvedTo(RAW_FIR)] anonymousObjectInInvalidPosition.kt
private final? [ResolvedTo(RAW_FIR)] val resolveMe: A = LAZY_EXPRESSION
private [ResolvedTo(RAW_FIR)] get(): A
public? final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit|
}
@@ -11,7 +11,7 @@ IMPORTS:
FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt
private final? [ResolvedTo(RAW_FIR)] val resolveMe: A = LAZY_EXPRESSION
private [ResolvedTo(RAW_FIR)] get(): A
public? final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit|
}
@@ -20,7 +20,7 @@ COMPILER_REQUIRED_ANNOTATIONS:
FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt
private final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] val resolveMe: A = LAZY_EXPRESSION
private [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): A
public? final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit|
}
@@ -29,7 +29,7 @@ COMPANION_GENERATION:
FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt
private final? [ResolvedTo(COMPANION_GENERATION)] val resolveMe: A = LAZY_EXPRESSION
private [ResolvedTo(COMPANION_GENERATION)] get(): A
public? final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit|
}
@@ -38,7 +38,7 @@ SUPER_TYPES:
FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt
private final? [ResolvedTo(SUPER_TYPES)] val resolveMe: A = LAZY_EXPRESSION
private [ResolvedTo(SUPER_TYPES)] get(): A
public? final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit|
}
@@ -47,7 +47,7 @@ TYPES:
FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt
private final? [ResolvedTo(TYPES)] val resolveMe: <ERROR TYPE REF: Wrong number of type arguments> = LAZY_EXPRESSION
private [ResolvedTo(TYPES)] get(): <ERROR TYPE REF: Wrong number of type arguments>
public? final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit|
}
@@ -56,7 +56,7 @@ STATUS:
FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt
private final [ResolvedTo(STATUS)] val resolveMe: <ERROR TYPE REF: Wrong number of type arguments> = LAZY_EXPRESSION
private [ResolvedTo(STATUS)] get(): <ERROR TYPE REF: Wrong number of type arguments>
public? final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit|
}
@@ -65,7 +65,7 @@ EXPECT_ACTUAL_MATCHING:
FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt
private final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val resolveMe: <ERROR TYPE REF: Wrong number of type arguments> = LAZY_EXPRESSION
private [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): <ERROR TYPE REF: Wrong number of type arguments>
public? final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit|
}
@@ -83,7 +83,7 @@ FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt
}
private [ResolvedTo(CONTRACTS)] get(): <ERROR TYPE REF: Wrong number of type arguments>
public? final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit|
}
@@ -101,7 +101,7 @@ FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt
}
private [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Wrong number of type arguments>
public? final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit|
}
@@ -119,7 +119,7 @@ FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt
}
private [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): <ERROR TYPE REF: Wrong number of type arguments>
public? final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit|
}