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/contextCollector/classHeaderPositions/contextReceiver.txt
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] contextReceiver.kt
LAZY_super<R|kotlin/Any|>
}
public? final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] constructor(): R|test/Base.Nested| {
LAZY_super<R|kotlin/Any|>
}
analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallee.txt
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallee.kt
LAZY_super<R|kotlin/Any|>
}
public? final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] constructor(): R|test/Base.Nested| {
LAZY_super<R|kotlin/Any|>
}
analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCalleeGenerics.txt
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCalleeGenerics.kt
LAZY_super<R|kotlin/Any|>
}
public? final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] constructor(): R|test/Base.Nested| {
LAZY_super<R|kotlin/Any|>
}
analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallee_objectLiteral.txt
Vendored
+2 -2
View File
@@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallee_objectLiteral.kt
LAZY_super<R|kotlin/Any|>
}
public? final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] constructor(): R|test/Base.Nested| {
LAZY_super<R|kotlin/Any|>
}
@@ -33,4 +33,4 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallee_objectLiteral.kt
}
public [ResolvedTo(BODY_RESOLVE)] get(): R|test/Base|
public [ResolvedTo(BODY_RESOLVE)] get(): R|test/Base|
analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRef.txt
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeRef.kt
LAZY_super<R|kotlin/Any|>
}
public? final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] constructor(): R|test/Base.Nested| {
LAZY_super<R|kotlin/Any|>
}
analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRefGenerics.txt
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeRefGenerics.kt
LAZY_super<R|kotlin/Any|>
}
public? final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] constructor(): R|test/Base.Nested| {
LAZY_super<R|kotlin/Any|>
}
analysis/low-level-api-fir/testData/contextCollector/scripts/insideClassMember.txt
Vendored
+6 -6
View File
@@ -14,8 +14,8 @@ Tower Data Context:
Element 6
Scope: FirScriptDeclarationsScope
Classifiers:
FirRegularClassSymbol public? final? class After_OtherClass : R|kotlin/Any|
FirRegularClassSymbol public? final? class Before_OtherClass : R|kotlin/Any|
FirRegularClassSymbol public final? class After_OtherClass : R|kotlin/Any|
FirRegularClassSymbol public final? class Before_OtherClass : R|kotlin/Any|
FirRegularClassSymbol public final class MyClass : R|kotlin/Any|
Functions
FirNamedFunctionSymbol public? final? fun after_Fun(): R|kotlin/Unit|
@@ -41,13 +41,13 @@ Tower Data Context:
public? final? val before_Val: <implicit>
public? get(): <implicit>
public? final? class Before_OtherClass : R|kotlin/Any|
public final? class Before_OtherClass : R|kotlin/Any|
public final class MyClass : R|kotlin/Any|
public? final? fun after_Fun(): R|kotlin/Unit|
public? final? val after_Val: <implicit>
public? get(): <implicit>
public? final? class After_OtherClass : R|kotlin/Any|
public final? class After_OtherClass : R|kotlin/Any|
Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
Label: <script>
Element 9
@@ -69,7 +69,7 @@ FILE: [ResolvedTo(IMPORTS)] insideClassMember.kts
public? final? [ResolvedTo(RAW_FIR)] val before_Val: <implicit> = LAZY_EXPRESSION
public? [ResolvedTo(RAW_FIR)] get(): <implicit>
public? final? [ResolvedTo(RAW_FIR)] class Before_OtherClass : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Before_OtherClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] constructor(): R|Before_OtherClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -95,7 +95,7 @@ FILE: [ResolvedTo(IMPORTS)] insideClassMember.kts
public? final? [ResolvedTo(RAW_FIR)] val after_Val: <implicit> = LAZY_EXPRESSION
public? [ResolvedTo(RAW_FIR)] get(): <implicit>
public? final? [ResolvedTo(RAW_FIR)] class After_OtherClass : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class After_OtherClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] constructor(): R|After_OtherClass| {
LAZY_super<R|kotlin/Any|>
}
analysis/low-level-api-fir/testData/contextCollector/scripts/insideTopLevelFunction.txt
Vendored
+6 -6
View File
@@ -14,8 +14,8 @@ Tower Data Context:
Element 6
Scope: FirScriptDeclarationsScope
Classifiers:
FirRegularClassSymbol public? final? class After_OtherClass : R|kotlin/Any|
FirRegularClassSymbol public? final? class Before_OtherClass : R|kotlin/Any|
FirRegularClassSymbol public final? class After_OtherClass : R|kotlin/Any|
FirRegularClassSymbol public final? class Before_OtherClass : R|kotlin/Any|
Functions
FirNamedFunctionSymbol public? final? fun after_Fun(): R|kotlin/Unit|
FirNamedFunctionSymbol public? final? fun before_Fun(): R|kotlin/Unit|
@@ -41,13 +41,13 @@ Tower Data Context:
public? final? val before_Val: <implicit>
public? get(): <implicit>
public? final? class Before_OtherClass : R|kotlin/Any|
public final? class Before_OtherClass : R|kotlin/Any|
public final fun usage(foo: R|kotlin/Int|): R|kotlin/Unit|
public? final? fun after_Fun(): R|kotlin/Unit|
public? final? val after_Val: <implicit>
public? get(): <implicit>
public? final? class After_OtherClass : R|kotlin/Any|
public final? class After_OtherClass : R|kotlin/Any|
Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
Label: <script>
Element 9
@@ -67,7 +67,7 @@ FILE: [ResolvedTo(IMPORTS)] insideTopLevelFunction.kts
public? final? [ResolvedTo(RAW_FIR)] val before_Val: <implicit> = LAZY_EXPRESSION
public? [ResolvedTo(RAW_FIR)] get(): <implicit>
public? final? [ResolvedTo(RAW_FIR)] class Before_OtherClass : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Before_OtherClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] constructor(): R|Before_OtherClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -83,7 +83,7 @@ FILE: [ResolvedTo(IMPORTS)] insideTopLevelFunction.kts
public? final? [ResolvedTo(RAW_FIR)] val after_Val: <implicit> = LAZY_EXPRESSION
public? [ResolvedTo(RAW_FIR)] get(): <implicit>
public? final? [ResolvedTo(RAW_FIR)] class After_OtherClass : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class After_OtherClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] constructor(): R|After_OtherClass| {
LAZY_super<R|kotlin/Any|>
}
analysis/low-level-api-fir/testData/contextCollector/simple.txt
Vendored
+1 -1
View File
@@ -39,7 +39,7 @@ FILE: [ResolvedTo(IMPORTS)] simple.kt
}
}
public? final? [ResolvedTo(RAW_FIR)] class Unrelated : R|kotlin/Any| {
public final? [ResolvedTo(RAW_FIR)] class Unrelated : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] constructor(): R|foo/Unrelated| {
LAZY_super<R|kotlin/Any|>
}
analysis/low-level-api-fir/testData/contextCollector/smartCasts/onType.txt
Vendored
+1 -1
View File
@@ -35,7 +35,7 @@ FILE: [ResolvedTo(IMPORTS)] onType.kt
}
public final inline [ResolvedTo(CONTRACTS)] fun <reified [ResolvedTo(CONTRACTS)] T : R|kotlin/Any|> call(): R|kotlin/Unit| {
}
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 process(): Boolean
}
analysis/low-level-api-fir/testData/contextCollector/smartCasts/orRight.txt
Vendored
+1 -1
View File
@@ -19,7 +19,7 @@ Tower Data Context:
Scope: FirLocalScope
FILE: [ResolvedTo(IMPORTS)] orRight.kt
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)] val isValid: Boolean
public? [ResolvedTo(RAW_FIR)] get(): Boolean