azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[LL FIR] resolve class before constructor

Browse Source 
This is required to have stable resolution order to avoid concurrent
modifications and correct resolution context.
This also fixes KT-63700 as a super call expands only during body
resolution in the case of secondary constructor

^KT-63042
^KT-63700 Fixed
This commit is contained in:
Dmitrii Gridin
2023-11-22 12:21:47 +01:00
committed by Space Team
parent e3d91741ca
commit 5183019cb8
207 changed files with 2011 additions and 1019 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/testData/getOrBuildFir/declarations/constructorParameter.txt
Vendored
+2 -2
View File
@@ -7,9 +7,9 @@ FIR element rendered:
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] constructorParameter.kt
public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class X : R|kotlin/Any| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor([ResolvedTo(BODY_RESOLVE)] resolveMe: R|kotlin/Int| = Int(5)): R|X| {
super<R|kotlin/Any|>()
}
}
}
analysis/low-level-api-fir/testData/getOrBuildFir/declarations/constructorParameterScript.txt
Vendored
+2 -2
View File
@@ -11,9 +11,9 @@ FILE: [ResolvedTo(IMPORTS)] constructorParameterScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-constructorParameterScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class X : R|kotlin/Any| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor([ResolvedTo(BODY_RESOLVE)] resolveMe: R|kotlin/Int| = Int(5)): R|X| {
super<R|kotlin/Any|>()
}
}
}
analysis/low-level-api-fir/testData/getOrBuildFir/declarations/constructorProperty.txt
Vendored
+2 -2
View File
@@ -7,7 +7,7 @@ FIR element rendered:
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] constructorProperty.kt
public final [ResolvedTo(STATUS)] class Abc : R|kotlin/Any| {
public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Abc : R|kotlin/Any| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Abc] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Abc.i] i: R|kotlin/Int| = Int(4)): R|Abc| {
super<R|kotlin/Any|>()
}
@@ -15,4 +15,4 @@ FILE: [ResolvedTo(IMPORTS)] constructorProperty.kt
public final [ResolvedTo(BODY_RESOLVE)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Abc] get(): R|kotlin/Int|
}
}
analysis/low-level-api-fir/testData/getOrBuildFir/declarations/constructorPropertyScript.txt
Vendored
+2 -2
View File
@@ -11,7 +11,7 @@ FILE: [ResolvedTo(IMPORTS)] constructorPropertyScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-constructorPropertyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public final [ResolvedTo(STATUS)] class Abc : R|kotlin/Any| {
public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Abc : R|kotlin/Any| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Abc] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Abc.i] i: R|kotlin/Int| = Int(4)): R|Abc| {
super<R|kotlin/Any|>()
}
@@ -19,4 +19,4 @@ FILE: [ResolvedTo(IMPORTS)] constructorPropertyScript.kts
public final [ResolvedTo(BODY_RESOLVE)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Abc] get(): R|kotlin/Int|
}
}