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

[FIR] Property accessors are not part of class initialization

Browse Source 
When checking for class val property reassignment diagnostic, property
initializers should be treated as part of the class initialization.
However, property accessors should not. Previously, only the property
itself was checked for both of these situations and resulted in not
reporting diagnostic within property accessors.

#KT-59744 Fixed
This commit is contained in:
Brian Norman
2023-08-16 07:15:29 -05:00
committed by Space Team
parent e68cf38e99
commit 7db551c452
3 changed files with 76 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/cfa/reassignOfNonLocalProperty_initializedProperties.fir.txt
Vendored
+27
View File
@@ -28,6 +28,33 @@ FILE: reassignOfNonLocalProperty_initializedProperties.kt
)
public get(): R|kotlin/String|
public final var b: R|kotlin/String| = String(hello)
public get(): R|kotlin/String| {
this@R|/Some|.R|/Some.x| = String(error)
this@R|/Some|.R|/y| = String(error)
R|/z| = String(error)
^ this@R|/Some|.F|/Some.b|
}
public set(value: R|kotlin/String|): R|kotlin/Unit| {
this@R|/Some|.R|/Some.x| = R|<local>/value|
this@R|/Some|.R|/y| = R|<local>/value|
R|/z| = R|<local>/value|
this@R|/Some|.F|/Some.b| = R|<local>/value|
}
public final var c: R|kotlin/String|
public get(): R|kotlin/String| {
this@R|/Some|.R|/Some.x| = String(error)
this@R|/Some|.R|/y| = String(error)
R|/z| = String(error)
^ String(hello)
}
public set(value: R|kotlin/String|): R|kotlin/Unit| {
this@R|/Some|.R|/Some.x| = R|<local>/value|
this@R|/Some|.R|/y| = R|<local>/value|
R|/z| = R|<local>/value|
}
public final fun test_1(): R|kotlin/Unit| {
this@R|/Some|.R|/Some.x| = String(error)
this@R|/Some|.R|/y| = String(error)
compiler/fir/analysis-tests/testData/resolve/cfa/reassignOfNonLocalProperty_initializedProperties.kt
Vendored
+28 -1
View File
@@ -1,4 +1,4 @@
// ISSUE: KT-55493
// ISSUE: KT-55493, KT-59744
// WITH_STDLIB
val z: String = "ok"
@@ -22,6 +22,33 @@ class Some {
"hello"
}
var b: String = "hello"
get() {
<!VAL_REASSIGNMENT!>x<!> = "error"
<!VAL_REASSIGNMENT!>y<!> = "error"
<!VAL_REASSIGNMENT!>z<!> = "error"
return field
}
set(value) {
<!VAL_REASSIGNMENT!>x<!> = value
<!VAL_REASSIGNMENT!>y<!> = value
<!VAL_REASSIGNMENT!>z<!> = value
field = value
}
var c: String
get() {
<!VAL_REASSIGNMENT!>x<!> = "error"
<!VAL_REASSIGNMENT!>y<!> = "error"
<!VAL_REASSIGNMENT!>z<!> = "error"
return "hello"
}
set(value) {
<!VAL_REASSIGNMENT!>x<!> = value
<!VAL_REASSIGNMENT!>y<!> = value
<!VAL_REASSIGNMENT!>z<!> = value
}
fun test_1() {
<!VAL_REASSIGNMENT!>x<!> = "error"
<!VAL_REASSIGNMENT!>y<!> = "error"