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/script3.txt
Vendored
+12 -12
View File
@@ -4,7 +4,7 @@ FILE: [ResolvedTo(RAW_FIR)] script3.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-script3.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -42,7 +42,7 @@ FILE: [ResolvedTo(IMPORTS)] script3.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-script3.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] script3.kts
SCRIPT: [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] <script-script3.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -118,7 +118,7 @@ FILE: [ResolvedTo(IMPORTS)] script3.kts
SCRIPT: [ResolvedTo(COMPANION_GENERATION)] <script-script3.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -156,7 +156,7 @@ FILE: [ResolvedTo(IMPORTS)] script3.kts
SCRIPT: [ResolvedTo(SUPER_TYPES)] <script-script3.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -194,7 +194,7 @@ FILE: [ResolvedTo(IMPORTS)] script3.kts
SCRIPT: [ResolvedTo(TYPES)] <script-script3.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -232,7 +232,7 @@ FILE: [ResolvedTo(IMPORTS)] script3.kts
SCRIPT: [ResolvedTo(STATUS)] <script-script3.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -270,7 +270,7 @@ FILE: [ResolvedTo(IMPORTS)] script3.kts
SCRIPT: [ResolvedTo(EXPECT_ACTUAL_MATCHING)] <script-script3.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -308,7 +308,7 @@ FILE: [ResolvedTo(IMPORTS)] script3.kts
SCRIPT: [ResolvedTo(CONTRACTS)] <script-script3.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -346,7 +346,7 @@ FILE: [ResolvedTo(IMPORTS)] script3.kts
SCRIPT: [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] <script-script3.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -384,7 +384,7 @@ FILE: [ResolvedTo(IMPORTS)] script3.kts
SCRIPT: [ResolvedTo(ANNOTATION_ARGUMENTS)] <script-script3.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -422,7 +422,7 @@ FILE: [ResolvedTo(IMPORTS)] script3.kts
SCRIPT: [ResolvedTo(BODY_RESOLVE)] <script-script3.kts>
[ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
LAZY_super<R|kotlin/Any|>
}