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

FIR: introduce delegate field initializers

Browse Source 
Before this commit we initialized delegate fields in primary constructor,
that could provoke NPE in case delegate is used in initializer of
some property backing field.
Now we initialize delegate fields directly instead.
This commit is contained in:
Mikhail Glukhikh
2021-02-02 17:51:11 +03:00
parent 2cbdad0bb1
commit d4b0688690
69 changed files with 928 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/delegatedSuperType.fir.txt
Vendored
+2 -3
View File
@@ -13,13 +13,12 @@ FILE: delegatedSuperType.kt
}
public final class C : R|A| {
local final field <$$delegate_0>: R|A|
public constructor(b: R|B|): R|C| {
super<R|kotlin/Any|>()
this@R|/C|.R|<local>/<$$delegate_0>| = R|<local>/b|
}
local final field <$$delegate_0>: R|A| = R|<local>/b|
public final val b: R|B| = R|<local>/b|
public get(): R|B|
compiler/fir/analysis-tests/testData/resolve/diagnostics/anonymousObjectByDelegate.fir.txt
Vendored
+4 -6
View File
@@ -9,25 +9,23 @@ FILE: anonymousObjectByDelegate.kt
}
public final fun R|A|.test_1(): R|kotlin/Unit| {
object : R|B| {
local final field <$$delegate_0>: R|B|
private constructor(): R|<anonymous>| {
super<R|kotlin/Any|>()
this@R|/<anonymous>|.R|<local>/<$$delegate_0>| = this@R|/test_1|.R|/A.b|
}
local final field <$$delegate_0>: R|B| = this@R|/test_1|.R|/A.b|
}
}
public final fun R|A|.test_2(): R|kotlin/Unit| {
object : R|B| {
local final field <$$delegate_0>: R|B|
private constructor(): R|<anonymous>| {
super<R|kotlin/Any|>()
this@R|/<anonymous>|.R|<local>/<$$delegate_0>| = this@R|/test_2|.R|/A.b|
}
local final field <$$delegate_0>: R|B| = this@R|/test_2|.R|/A.b|
}
}
compiler/fir/analysis-tests/testData/resolve/diagnostics/delegationInInterface.fir.txt
Vendored
+2 -2
View File
@@ -6,7 +6,7 @@ FILE: delegationInInterface.kt
}
public abstract interface B : R|A| {
local final field <$$delegate_0>: R|A|
local final field <$$delegate_0>: R|A| = <Unresolved name: a>#
public abstract val a: R|A|
public get(): R|A|
@@ -15,6 +15,6 @@ FILE: delegationInInterface.kt
public final val test: R|A| = R|/A.A|()
public get(): R|A|
public abstract interface C : R|A| {
local final field <$$delegate_0>: R|A|
local final field <$$delegate_0>: R|A| = R|/test|
}
compiler/fir/analysis-tests/testData/resolve/diagnostics/delegationInInterface.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
class A
interface B : <!DELEGATION_IN_INTERFACE, INTERFACE_WITH_SUPERCLASS!>A<!> by a {
interface B : <!DELEGATION_IN_INTERFACE, INTERFACE_WITH_SUPERCLASS!>A<!> by <!UNRESOLVED_REFERENCE!>a<!> {
val a: A
}
compiler/fir/analysis-tests/testData/resolve/diagnostics/superCallWithDelegation.fir.txt
Vendored
+2 -3
View File
@@ -4,13 +4,12 @@ FILE: superCallWithDelegation.kt
}
public open class B : R|A| {
local final field <$$delegate_0>: R|A|
public constructor(a: R|A|): R|B| {
super<R|kotlin/Any|>()
this@R|/B|.R|<local>/<$$delegate_0>| = R|<local>/a|
}
local final field <$$delegate_0>: R|A| = R|<local>/a|
private final val a: R|A| = R|<local>/a|
private get(): R|A|