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

[FIR] fix false negative MUST_BE_INITIALIZED for deferred init + custom setter case

Browse Source 
^KT-58346 Fixed
Review: https://jetbrains.team/p/kt/reviews/9967

BTW this commit accidentaly and partially fixes KT-57553 for K2, because
of a cleaner K2 architecture. I will unify MUST_BE_INITIALIZED behaviour
in K1 and K2 in the next commits
This commit is contained in:
Nikita Bobko
2023-05-15 11:59:40 +02:00
parent 151144bbed
commit d9d4dee582
17 changed files with 87 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/backingField/InitCustomSetter.fir.kt
Vendored
-30
View File
@@ -1,30 +0,0 @@
class My(val v: Int) {
// Ok: setter is just private
var x: Int
private set
var y: Int
set(arg) { field = arg }
<!MUST_BE_INITIALIZED!>var z: Int<!>
set(arg) { field = arg }
// Ok: initializer available
var w: Int = v
set(arg) { field = arg }
// Ok: no backing field
var u: Int
get() = w
set(arg) { w = 2 * arg }
constructor(): this(0) {
z = v
}
init {
x = 1
y = 2
u = 3
}
}
compiler/testData/diagnostics/tests/backingField/InitCustomSetter.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
class My(val v: Int) {
// Ok: setter is just private
var x: Int
compiler/testData/diagnostics/tests/backingField/InitOpenSetter.fir.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ abstract class My(val v: Int) {
// Ok: variable is just abstract
abstract var x: Int
open var y: Int
<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>open var y: Int<!>
<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>open var z: Int<!>
compiler/testData/diagnostics/tests/backingField/MustBeInitializedEffectivelyFinalOff.fir.kt
Vendored
-12
View File
@@ -1,12 +0,0 @@
// !LANGUAGE:-TakeIntoAccountEffectivelyFinalInMustBeInitializedCheck
open class Base {
open var x: String = ""
}
class Foo : Base() {
override var x: String
init {
x = ""
}
}
compiler/testData/diagnostics/tests/backingField/MustBeInitializedEffectivelyFinalOff.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !LANGUAGE:-TakeIntoAccountEffectivelyFinalInMustBeInitializedCheck
open class Base {
open var x: String = ""
compiler/testData/diagnostics/tests/backingField/ValDeferredInitInOpenClass.fir.kt
Vendored
+53
View File
@@ -0,0 +1,53 @@
// !DIAGNOSTICS: -DEBUG_INFO_LEAKING_THIS
// a = final + not initialized in place + deferred init
// e = final + not initialized in place
// c = final + initialized in place
// b = open + not initialized in place + deferred init
// f = open + not initialized in place
// d = open + initialized in place
open class Foo {
// no getter
val a0: Int
<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>val e0: Int<!>
val c0: Int = 1
<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>open val b0: Int<!>
<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>open val f0: Int<!>
open val d0: Int = 1
// getter with field
val a1: Int; get() = field
<!MUST_BE_INITIALIZED!>val e1: Int<!>; get() = field
val c1: Int = 1; get() = field
<!MUST_BE_INITIALIZED!>open val b1: Int<!>; get() = field
<!MUST_BE_INITIALIZED!>open val f1: Int<!>; get() = field
open val d1: Int = 1; get() = field
// getter with empty body
val a2: Int; get
<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>val e2: Int<!>; get
val c2: Int = 1; get
<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>open val b2: Int<!>; get
<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>open val f2: Int<!>; get
open val d2: Int = 1; get
// getter no field
val a3: Int; get() = 1
val e3: Int; get() = 1
val c3: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>1<!>; get() = 1
open val b3: Int; get() = 1
open val f3: Int; get() = 1
open val d3: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>1<!>; get() = 1
init {
a0 = 1
a1 = 1
a2 = 1
<!VAL_REASSIGNMENT!>a3<!> = 1
b0 = 1
b1 = 1
b2 = 1
<!VAL_REASSIGNMENT!>b3<!> = 1
}
}
compiler/testData/diagnostics/tests/backingField/ValDeferredInitInOpenClass.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_IDENTICAL
// !DIAGNOSTICS: -DEBUG_INFO_LEAKING_THIS
// a = final + not initialized in place + deferred init
// e = final + not initialized in place
compiler/testData/diagnostics/tests/backingField/VarDeferredInitInFinalClass.fir.kt
Vendored
-128
View File
@@ -1,128 +0,0 @@
// !DIAGNOSTICS: -DEBUG_INFO_LEAKING_THIS
// a = final + not initialized in place + deferred init
// e = final + not initialized in place
// c = final + initialized in place
// b = open + not initialized in place + deferred init
// f = open + not initialized in place
// d = open + initialized in place
class Foo : I {
// no setter; setter with field; setter with empty body; setter no field;
// no getter
var a00: Int; var a01: Int; set(v) { field = v }; var a02: Int; set; var a03: Int; set(v) {};
<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>var e00: Int<!>; <!MUST_BE_INITIALIZED!>var e01: Int<!>; set(v) { field = v }; <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>var e02: Int<!>; set; <!MUST_BE_INITIALIZED!>var e03: Int<!>; set(v) {};
var c00: Int = 1; var c01: Int = 1; set(v) { field = v }; var c02: Int = 1; set; var c03: Int = 1; set(v) {};
override var b00: Int; override var b01: Int; set(v) { field = v }; override var b02: Int; set; override var b03: Int; set(v) {};
<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>override var f00: Int<!>; <!MUST_BE_INITIALIZED!>override var f01: Int<!>; set(v) { field = v }; <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>override var f02: Int<!>; set; <!MUST_BE_INITIALIZED!>override var f03: Int<!>; set(v) {};
override var d00: Int = 1; override var d01: Int = 1; set(v) { field = v }; override var d02: Int = 1; set; override var d03: Int = 1; set(v) {};
// getter with field
var a10: Int; get() = field; var a11: Int; set(v) { field = v } get() = field; var a12: Int; set get() = field; var a13: Int; set(v) {} get() = field;
<!MUST_BE_INITIALIZED!>var e10: Int<!>; get() = field; <!MUST_BE_INITIALIZED!>var e11: Int<!>; set(v) { field = v } get() = field; <!MUST_BE_INITIALIZED!>var e12: Int<!>; set get() = field; <!MUST_BE_INITIALIZED!>var e13: Int<!>; set(v) {} get() = field;
var c10: Int = 1; get() = field; var c11: Int = 1; set(v) { field = v } get() = field; var c12: Int = 1; set get() = field; var c13: Int = 1; set(v) {} get() = field;
override var b10: Int; get() = field; override var b11: Int; set(v) { field = v } get() = field; override var b12: Int; set get() = field; override var b13: Int; set(v) {} get() = field;
<!MUST_BE_INITIALIZED!>override var f10: Int<!>; get() = field; <!MUST_BE_INITIALIZED!>override var f11: Int<!>; set(v) { field = v } get() = field; <!MUST_BE_INITIALIZED!>override var f12: Int<!>; set get() = field; <!MUST_BE_INITIALIZED!>override var f13: Int<!>; set(v) {} get() = field;
override var d10: Int = 1; get() = field; override var d11: Int = 1; set(v) { field = v } get() = field; override var d12: Int = 1; set get() = field; override var d13: Int = 1; set(v) {} get() = field;
// getter with empty body
var a20: Int; get; var a21: Int; set(v) { field = v } get; var a22: Int; set get; var a23: Int; set(v) {} get;
<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>var e20: Int<!>; get; <!MUST_BE_INITIALIZED!>var e21: Int<!>; set(v) { field = v } get; <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>var e22: Int<!>; set get; <!MUST_BE_INITIALIZED!>var e23: Int<!>; set(v) {} get;
var c20: Int = 1; get; var c21: Int = 1; set(v) { field = v } get; var c22: Int = 1; set get; var c23: Int = 1; set(v) {} get;
override var b20: Int; get; override var b21: Int; set(v) { field = v } get; override var b22: Int; set get; override var b23: Int; set(v) {} get;
<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>override var f20: Int<!>; get; <!MUST_BE_INITIALIZED!>override var f21: Int<!>; set(v) { field = v } get; <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>override var f22: Int<!>; set get; <!MUST_BE_INITIALIZED!>override var f23: Int<!>; set(v) {} get;
override var d20: Int = 1; get; override var d21: Int = 1; set(v) { field = v } get; override var d22: Int = 1; set get; override var d23: Int = 1; set(v) {} get;
// getter no field
var a30: Int; get() = 1; var a31: Int; set(v) { field = v } get() = 1; var a32: Int; set get() = 1; var a33: Int; set(v) {} get() = 1;
<!MUST_BE_INITIALIZED!>var e30: Int<!>; get() = 1; <!MUST_BE_INITIALIZED!>var e31: Int<!>; set(v) { field = v } get() = 1; <!MUST_BE_INITIALIZED!>var e32: Int<!>; set get() = 1; var e33: Int; set(v) {} get() = 1;
var c30: Int = 1; get() = 1; var c31: Int = 1; set(v) { field = v } get() = 1; var c32: Int = 1; set get() = 1; var c33: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>1<!>; set(v) {} get() = 1;
override var b30: Int; get() = 1; override var b31: Int; set(v) { field = v } get() = 1; override var b32: Int; set get() = 1; override var b33: Int; set(v) {} get() = 1;
<!MUST_BE_INITIALIZED!>override var f30: Int<!>; get() = 1; <!MUST_BE_INITIALIZED!>override var f31: Int<!>; set(v) { field = v } get() = 1; <!MUST_BE_INITIALIZED!>override var f32: Int<!>; set get() = 1; override var f33: Int; set(v) {} get() = 1;
override var d30: Int = 1; get() = 1; override var d31: Int = 1; set(v) { field = v } get() = 1; override var d32: Int = 1; set get() = 1; override var d33: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>1<!>; set(v) {} get() = 1;
init {
a00 = 1
a01 = 1
a02 = 1
a03 = 1
a10 = 1
a11 = 1
a12 = 1
a13 = 1
a20 = 1
a21 = 1
a22 = 1
a23 = 1
a30 = 1
a31 = 1
a32 = 1
a33 = 1
b00 = 1
b01 = 1
b02 = 1
b03 = 1
b10 = 1
b11 = 1
b12 = 1
b13 = 1
b20 = 1
b21 = 1
b22 = 1
b23 = 1
b30 = 1
b31 = 1
b32 = 1
b33 = 1
}
}
interface I {
val b00: Int
val b01: Int
val b02: Int
val b03: Int
val b10: Int
val b11: Int
val b12: Int
val b13: Int
val b20: Int
val b21: Int
val b22: Int
val b23: Int
val b30: Int
val b31: Int
val b32: Int
val b33: Int
val f00: Int
val f01: Int
val f02: Int
val f03: Int
val f10: Int
val f11: Int
val f12: Int
val f13: Int
val f20: Int
val f21: Int
val f22: Int
val f23: Int
val f30: Int
val f31: Int
val f32: Int
val f33: Int
val d00: Int
val d01: Int
val d02: Int
val d03: Int
val d10: Int
val d11: Int
val d12: Int
val d13: Int
val d20: Int
val d21: Int
val d22: Int
val d23: Int
val d30: Int
val d31: Int
val d32: Int
val d33: Int
}
compiler/testData/diagnostics/tests/backingField/VarDeferredInitInFinalClass.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !DIAGNOSTICS: -DEBUG_INFO_LEAKING_THIS
// a = final + not initialized in place + deferred init
// e = final + not initialized in place
compiler/testData/diagnostics/tests/backingField/VarDeferredInitInOpenClass.fir.kt
Vendored
-75
View File
@@ -1,75 +0,0 @@
// !DIAGNOSTICS: -DEBUG_INFO_LEAKING_THIS
// a = final + not initialized in place + deferred init
// e = final + not initialized in place
// c = final + initialized in place
// b = open + not initialized in place + deferred init
// f = open + not initialized in place
// d = open + initialized in place
open class Foo {
// no setter; setter with field; setter with empty body; setter no field;
// no getter
var a00: Int; var a01: Int; set(v) { field = v }; var a02: Int; set; var a03: Int; set(v) {};
<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>var e00: Int<!>; <!MUST_BE_INITIALIZED!>var e01: Int<!>; set(v) { field = v }; <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>var e02: Int<!>; set; <!MUST_BE_INITIALIZED!>var e03: Int<!>; set(v) {};
var c00: Int = 1; var c01: Int = 1; set(v) { field = v }; var c02: Int = 1; set; var c03: Int = 1; set(v) {};
open var b00: Int; open var b01: Int; set(v) { field = v }; open var b02: Int; set; open var b03: Int; set(v) {};
<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>open var f00: Int<!>; <!MUST_BE_INITIALIZED!>open var f01: Int<!>; set(v) { field = v }; <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>open var f02: Int<!>; set; <!MUST_BE_INITIALIZED!>open var f03: Int<!>; set(v) {};
open var d00: Int = 1; open var d01: Int = 1; set(v) { field = v }; open var d02: Int = 1; set; open var d03: Int = 1; set(v) {};
// getter with field
var a10: Int; get() = field; var a11: Int; set(v) { field = v } get() = field; var a12: Int; set get() = field; var a13: Int; set(v) {} get() = field;
<!MUST_BE_INITIALIZED!>var e10: Int<!>; get() = field; <!MUST_BE_INITIALIZED!>var e11: Int<!>; set(v) { field = v } get() = field; <!MUST_BE_INITIALIZED!>var e12: Int<!>; set get() = field; <!MUST_BE_INITIALIZED!>var e13: Int<!>; set(v) {} get() = field;
var c10: Int = 1; get() = field; var c11: Int = 1; set(v) { field = v } get() = field; var c12: Int = 1; set get() = field; var c13: Int = 1; set(v) {} get() = field;
open var b10: Int; get() = field; open var b11: Int; set(v) { field = v } get() = field; open var b12: Int; set get() = field; open var b13: Int; set(v) {} get() = field;
<!MUST_BE_INITIALIZED!>open var f10: Int<!>; get() = field; <!MUST_BE_INITIALIZED!>open var f11: Int<!>; set(v) { field = v } get() = field; <!MUST_BE_INITIALIZED!>open var f12: Int<!>; set get() = field; <!MUST_BE_INITIALIZED!>open var f13: Int<!>; set(v) {} get() = field;
open var d10: Int = 1; get() = field; open var d11: Int = 1; set(v) { field = v } get() = field; open var d12: Int = 1; set get() = field; open var d13: Int = 1; set(v) {} get() = field;
// getter with empty body
var a20: Int; get; var a21: Int; set(v) { field = v } get; var a22: Int; set get; var a23: Int; set(v) {} get;
<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>var e20: Int<!>; get; <!MUST_BE_INITIALIZED!>var e21: Int<!>; set(v) { field = v } get; <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>var e22: Int<!>; set get; <!MUST_BE_INITIALIZED!>var e23: Int<!>; set(v) {} get;
var c20: Int = 1; get; var c21: Int = 1; set(v) { field = v } get; var c22: Int = 1; set get; var c23: Int = 1; set(v) {} get;
open var b20: Int; get; open var b21: Int; set(v) { field = v } get; open var b22: Int; set get; open var b23: Int; set(v) {} get;
<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>open var f20: Int<!>; get; <!MUST_BE_INITIALIZED!>open var f21: Int<!>; set(v) { field = v } get; <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>open var f22: Int<!>; set get; <!MUST_BE_INITIALIZED!>open var f23: Int<!>; set(v) {} get;
open var d20: Int = 1; get; open var d21: Int = 1; set(v) { field = v } get; open var d22: Int = 1; set get; open var d23: Int = 1; set(v) {} get;
// getter no field
var a30: Int; get() = 1; var a31: Int; set(v) { field = v } get() = 1; var a32: Int; set get() = 1; var a33: Int; set(v) {} get() = 1;
<!MUST_BE_INITIALIZED!>var e30: Int<!>; get() = 1; <!MUST_BE_INITIALIZED!>var e31: Int<!>; set(v) { field = v } get() = 1; <!MUST_BE_INITIALIZED!>var e32: Int<!>; set get() = 1; var e33: Int; set(v) {} get() = 1;
var c30: Int = 1; get() = 1; var c31: Int = 1; set(v) { field = v } get() = 1; var c32: Int = 1; set get() = 1; var c33: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>1<!>; set(v) {} get() = 1;
open var b30: Int; get() = 1; open var b31: Int; set(v) { field = v } get() = 1; open var b32: Int; set get() = 1; open var b33: Int; set(v) {} get() = 1;
<!MUST_BE_INITIALIZED!>open var f30: Int<!>; get() = 1; <!MUST_BE_INITIALIZED!>open var f31: Int<!>; set(v) { field = v } get() = 1; <!MUST_BE_INITIALIZED!>open var f32: Int<!>; set get() = 1; open var f33: Int; set(v) {} get() = 1;
open var d30: Int = 1; get() = 1; open var d31: Int = 1; set(v) { field = v } get() = 1; open var d32: Int = 1; set get() = 1; open var d33: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>1<!>; set(v) {} get() = 1;
init {
a00 = 1
a01 = 1
a02 = 1
a03 = 1
a10 = 1
a11 = 1
a12 = 1
a13 = 1
a20 = 1
a21 = 1
a22 = 1
a23 = 1
a30 = 1
a31 = 1
a32 = 1
a33 = 1
b00 = 1
b01 = 1
b02 = 1
b03 = 1
b10 = 1
b11 = 1
b12 = 1
b13 = 1
b20 = 1
b21 = 1
b22 = 1
b23 = 1
b30 = 1
b31 = 1
b32 = 1
b33 = 1
}
}
compiler/testData/diagnostics/tests/backingField/VarDeferredInitInOpenClass.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !DIAGNOSTICS: -DEBUG_INFO_LEAKING_THIS
// a = final + not initialized in place + deferred init
// e = final + not initialized in place