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/dataClassCopyScript.txt
Vendored
+7 -7
View File
@@ -56,7 +56,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-dataClassCopyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class DataClass : R|kotlin/Any| {
public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -82,7 +82,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-dataClassCopyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| {
public? final? data [ResolvedTo(COMPANION_GENERATION)] class DataClass : R|kotlin/Any| {
public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=DataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -186,7 +186,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
SCRIPT: [ResolvedTo(RAW_FIR)] <script-dataClassCopyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class DataClass : R|kotlin/Any| {
public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=DataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -212,7 +212,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-dataClassCopyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
public final data [ResolvedTo(CONTRACTS)] class DataClass : R|kotlin/Any| {
public [ResolvedTo(CONTRACTS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -238,7 +238,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-dataClassCopyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class DataClass : R|kotlin/Any| {
public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=DataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -264,7 +264,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-dataClassCopyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class DataClass : R|kotlin/Any| {
public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -290,7 +290,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
SCRIPT: [ResolvedTo(TYPES)] <script-dataClassCopyScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| {
public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class DataClass : R|kotlin/Any| {
public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
LAZY_super<R|kotlin/Any|>
}