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/complexRedeclarationScript.txt
Vendored
+8 -7
View File
@@ -301,7 +301,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
LAZY_super<R|kotlin/Any|>
}
public? final? [ResolvedTo(RAW_FIR)] class I : P {
public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class I : P {
public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=I] constructor(): R|B.I| {
LAZY_super<P>
}
@@ -406,7 +406,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
LAZY_super<R|kotlin/Any|>
}
public? final? [ResolvedTo(RAW_FIR)] class I : P {
public? final? [ResolvedTo(COMPANION_GENERATION)] class I : P {
public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=I] constructor(): R|B.I| {
LAZY_super<P>
}
@@ -826,7 +826,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
LAZY_super<R|kotlin/Any|>
}
public final [ResolvedTo(STATUS)] class I : R|P| {
public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class I : R|P| {
public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=I] constructor(): R|B.I| {
LAZY_super<R|P|>
}
@@ -931,7 +931,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
LAZY_super<R|kotlin/Any|>
}
public final [ResolvedTo(STATUS)] class I : R|P| {
public final [ResolvedTo(CONTRACTS)] class I : R|P| {
public [ResolvedTo(CONTRACTS)] [ContainingClassKey=I] constructor(): R|B.I| {
LAZY_super<R|P|>
}
@@ -1036,7 +1036,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
LAZY_super<R|kotlin/Any|>
}
public final [ResolvedTo(STATUS)] class I : R|P| {
public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class I : R|P| {
public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=I] constructor(): R|B.I| {
LAZY_super<R|P|>
}
@@ -1141,7 +1141,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
LAZY_super<R|kotlin/Any|>
}
public final [ResolvedTo(STATUS)] class I : R|P| {
public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class I : R|P| {
public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=I] constructor(): R|B.I| {
LAZY_super<R|P|>
}
@@ -1246,7 +1246,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
LAZY_super<R|kotlin/Any|>
}
public final [ResolvedTo(STATUS)] class I : R|P| {
public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class I : R|P| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=I] constructor(): R|B.I| {
super<R|P|>()
}
@@ -1388,3 +1388,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] complexRedeclarationScript.kts
}
}