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/getOrBuildFir/annotations/annotationInsideWhereFunction.txt
Vendored
+2 -2
View File
@@ -16,9 +16,9 @@ FILE: [ResolvedTo(IMPORTS)] annotationInsideWhereFunction.kt
public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
}
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(ANNOTATION_ARGUMENTS)] fun <[ResolvedTo(ANNOTATION_ARGUMENTS)] T : R|One|, R|@R|Anno|(s = String(str)) Two|> foo([ResolvedTo(ANNOTATION_ARGUMENTS)] t: R|T|): R|T| {
^foo R|<local>/t|
analysis/low-level-api-fir/testData/getOrBuildFir/annotations/superCallAnnotation.txt
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] superCallAnnotation.kt
}
}
public? open [ResolvedTo(SUPER_TYPES)] class A : R|kotlin/Any| {
public open [ResolvedTo(SUPER_TYPES)] class A : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
LAZY_super<R|kotlin/Any|>
}
analysis/low-level-api-fir/testData/getOrBuildFir/annotations/superCallAnnotation2.txt
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] superCallAnnotation2.kt
}
}
public? final? [ResolvedTo(SUPER_TYPES)] interface A : R|kotlin/Any| {
public final? [ResolvedTo(SUPER_TYPES)] interface A : R|kotlin/Any| {
}
public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class B : R|@R|Anno|() A| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| {
analysis/low-level-api-fir/testData/getOrBuildFir/annotations/superCallAnnotationScript.txt
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] superCallAnnotationScript.kts
}
public? open [ResolvedTo(SUPER_TYPES)] class A : R|kotlin/Any| {
public open [ResolvedTo(SUPER_TYPES)] class A : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
LAZY_super<R|kotlin/Any|>
}
analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameter.txt
Vendored
+2 -2
View File
@@ -9,7 +9,7 @@ FIR FILE:
FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameter.kt
public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun t([ResolvedTo(ANNOTATION_ARGUMENTS)] addCommaWarning: R|@R|Anno|() kotlin/Boolean|): R|kotlin/Unit| {
}
public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
LAZY_super<R|kotlin/Any|>
}
@@ -20,4 +20,4 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameter.kt
LAZY_super<R|kotlin/Any|>
}
}
}
analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterScript.txt
Vendored
+2 -2
View File
@@ -14,7 +14,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameterScript.kts
public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun t([ResolvedTo(ANNOTATION_ARGUMENTS)] addCommaWarning: R|@R|Anno|() kotlin/Boolean|): R|kotlin/Unit| {
}
public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
LAZY_super<R|kotlin/Any|>
}
@@ -26,4 +26,4 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameterScript.kts
LAZY_super<R|kotlin/Any|>
}
}
}
analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArguments.txt
Vendored
+2 -2
View File
@@ -9,7 +9,7 @@ FIR FILE:
FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameterWithArguments.kt
public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun t([ResolvedTo(ANNOTATION_ARGUMENTS)] addCommaWarning: R|@R|Anno|(value = String(abcd)) kotlin/Boolean|): R|kotlin/Unit| {
}
public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
LAZY_super<R|kotlin/Any|>
}
@@ -23,4 +23,4 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameterWithArguments.kt
public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/String| = R|<local>/value|
public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
}
}
analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArgumentsScript.txt
Vendored
+2 -2
View File
@@ -14,7 +14,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameterWithArgumentsScri
public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun t([ResolvedTo(ANNOTATION_ARGUMENTS)] addCommaWarning: R|@R|Anno|(value = String(abcd)) kotlin/Boolean|): R|kotlin/Unit| {
}
public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
LAZY_super<R|kotlin/Any|>
}
@@ -29,4 +29,4 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameterWithArgumentsScri
public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/String| = R|<local>/value|
public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
}
}