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/delegatedFieldNestedNameClash.txt
Vendored
+24 -24
View File
@@ -1,10 +1,10 @@
RAW_FIR:
FILE: [ResolvedTo(RAW_FIR)] delegatedFieldNestedNameClash.kt
public? final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
}
public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base {
public final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: second.Base): R|second/MyClass| {
LAZY_super<<implicit>>
}
@@ -14,18 +14,18 @@ FILE: [ResolvedTo(RAW_FIR)] delegatedFieldNestedNameClash.kt
public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: second.Base = R|<local>/prop|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): second.Base
public? final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
}
}
IMPORTS:
FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt
public? final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
}
public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base {
public final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: second.Base): R|second/MyClass| {
LAZY_super<<implicit>>
}
@@ -35,18 +35,18 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt
public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: second.Base = R|<local>/prop|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): second.Base
public? final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
}
}
COMPILER_REQUIRED_ANNOTATIONS:
FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt
public? final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
}
public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base {
public final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: second.Base): R|second/MyClass| {
LAZY_super<<implicit>>
}
@@ -56,18 +56,18 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt
public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: second.Base = R|<local>/prop|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): second.Base
public? final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
}
}
COMPANION_GENERATION:
FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt
public? final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
}
public? final? [ResolvedTo(COMPANION_GENERATION)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base {
public final? [ResolvedTo(COMPANION_GENERATION)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: second.Base): R|second/MyClass| {
LAZY_super<<implicit>>
}
@@ -77,18 +77,18 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt
public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: second.Base = R|<local>/prop|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): second.Base
public? final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
}
}
SUPER_TYPES:
FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt
public? final? [ResolvedTo(SUPER_TYPES)] interface Base : R|kotlin/Any| {
public final? [ResolvedTo(SUPER_TYPES)] interface Base : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
}
public? final? [ResolvedTo(SUPER_TYPES)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| {
public final? [ResolvedTo(SUPER_TYPES)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: second.Base): R|second/MyClass| {
LAZY_super<<implicit>>
}
@@ -98,18 +98,18 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt
public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: second.Base = R|<local>/prop|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): second.Base
public? final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
}
}
TYPES:
FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt
public? final? [ResolvedTo(SUPER_TYPES)] interface Base : R|kotlin/Any| {
public final? [ResolvedTo(SUPER_TYPES)] interface Base : R|kotlin/Any| {
public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
}
public? final? [ResolvedTo(TYPES)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| {
public final? [ResolvedTo(TYPES)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: second.Base): R|second/MyClass| {
LAZY_super<<implicit>>
}
@@ -119,7 +119,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt
public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: second.Base = R|<local>/prop|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): second.Base
public? final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
}
}
@@ -140,7 +140,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt
public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|second/Base| = R|<local>/prop|
public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|second/Base|
public? final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
}
}
@@ -161,7 +161,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt
public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|second/Base| = R|<local>/prop|
public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|second/Base|
public? final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
}
}
@@ -182,7 +182,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt
public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|second/Base| = R|<local>/prop|
public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|second/Base|
public? final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
}
}
@@ -203,7 +203,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt
public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|second/Base| = R|<local>/prop|
public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|second/Base|
public? final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
}
}
@@ -224,7 +224,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt
public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|second/Base| = R|<local>/prop|
public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|second/Base|
public? final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
}
}
@@ -245,7 +245,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt
public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|second/Base| = R|<local>/prop|
public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|second/Base|
public? final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] interface Base : R|kotlin/Any| {
}
}