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/lazyResolve/primaryConstructorPropertyScript.txt
Vendored
+8 -7
View File
@@ -42,7 +42,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-primaryConstructorPropertyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class A : R|kotlin/Any| {
public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=A] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] a: Boolean, [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=/A.prop] prop: Int = LAZY_EXPRESSION): R|A| {
LAZY_super<R|kotlin/Any|>
}
@@ -61,7 +61,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-primaryConstructorPropertyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
public? final? [ResolvedTo(COMPANION_GENERATION)] class A : R|kotlin/Any| {
public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=A] constructor([ResolvedTo(COMPANION_GENERATION)] a: Boolean, [ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=/A.prop] prop: Int = LAZY_EXPRESSION): R|A| {
LAZY_super<R|kotlin/Any|>
}
@@ -137,7 +137,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-primaryConstructorPropertyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class A : R|kotlin/Any| {
public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=A] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] a: R|kotlin/Boolean|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = LAZY_EXPRESSION): R|A| {
LAZY_super<R|kotlin/Any|>
}
@@ -156,7 +156,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-primaryConstructorPropertyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
public final [ResolvedTo(CONTRACTS)] class A : R|kotlin/Any| {
public [ResolvedTo(CONTRACTS)] [ContainingClassKey=A] constructor([ResolvedTo(CONTRACTS)] a: R|kotlin/Boolean|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = LAZY_EXPRESSION): R|A| {
LAZY_super<R|kotlin/Any|>
}
@@ -175,7 +175,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-primaryConstructorPropertyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class A : R|kotlin/Any| {
public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] a: R|kotlin/Boolean|, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = LAZY_EXPRESSION): R|A| {
LAZY_super<R|kotlin/Any|>
}
@@ -194,7 +194,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-primaryConstructorPropertyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|kotlin/Any| {
public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] a: R|kotlin/Boolean|, [ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = LAZY_EXPRESSION): R|A| {
LAZY_super<R|kotlin/Any|>
}
@@ -213,7 +213,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-primaryConstructorPropertyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|kotlin/Any| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(BODY_RESOLVE)] a: R|kotlin/Boolean|, [ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42)): R|A| {
super<R|kotlin/Any|>()
}
@@ -245,3 +245,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] primaryConstructorPropertyScript.kts
}
}