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/delegatedFieldScript.txt
Vendored
+24 -24
View File
@@ -4,19 +4,19 @@ FILE: [ResolvedTo(RAW_FIR)] delegatedFieldScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-delegatedFieldScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit|
}
public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
public final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| {
LAZY_super<<implicit>>
}
@@ -34,19 +34,19 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-delegatedFieldScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit|
}
public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
public final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| {
LAZY_super<<implicit>>
}
@@ -64,19 +64,19 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-delegatedFieldScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit|
}
public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
public final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| {
LAZY_super<<implicit>>
}
@@ -94,19 +94,19 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-delegatedFieldScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit|
}
public? final? [ResolvedTo(COMPANION_GENERATION)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
public final? [ResolvedTo(COMPANION_GENERATION)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| {
LAZY_super<<implicit>>
}
@@ -124,19 +124,19 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-delegatedFieldScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo : R|kotlin/Any| {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit|
}
public? final? [ResolvedTo(SUPER_TYPES)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| {
public final? [ResolvedTo(SUPER_TYPES)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| {
LAZY_super<<implicit>>
}
@@ -154,19 +154,19 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-delegatedFieldScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? [ResolvedTo(SUPER_TYPES)] interface Foo : R|kotlin/Any| {
public final? [ResolvedTo(SUPER_TYPES)] interface Foo : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit|
}
public? final? [ResolvedTo(TYPES)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| {
public final? [ResolvedTo(TYPES)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| {
LAZY_super<<implicit>>
}
@@ -184,7 +184,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-delegatedFieldScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
LAZY_super<R|kotlin/Any|>
}
@@ -214,7 +214,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-delegatedFieldScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
LAZY_super<R|kotlin/Any|>
}
@@ -244,7 +244,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-delegatedFieldScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
LAZY_super<R|kotlin/Any|>
}
@@ -274,7 +274,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-delegatedFieldScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
LAZY_super<R|kotlin/Any|>
}
@@ -304,7 +304,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-delegatedFieldScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
LAZY_super<R|kotlin/Any|>
}
@@ -334,7 +334,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-delegatedFieldScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
LAZY_super<R|kotlin/Any|>
}