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

UNUSED_VALUE is now reported on expression only if this expression is unused in all (e.g. finally) branches #KT-9825 Fixed

Browse Source 
(cherry picked from commit aac8e94)
This commit is contained in:
Mikhail Glukhikh
2016-08-25 18:41:21 +03:00
committed by Mikhail Glukhikh
parent e363809b37
commit 6a9d058db4
10 changed files with 138 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cfg-variables/bugs/kt9825.instructions
Vendored
+46
View File
@@ -0,0 +1,46 @@
== test5 ==
fun test5() {
var a: Int
try {
a = 3
}
finally {
a = 5
}
a.hashCode()
}
---------------------
L0:
1 <START> INIT: in: {} out: {} USE: in: {} out: {}
2 mark({ var a: Int try { a = 3 } finally { a = 5 } a.hashCode() })
v(var a: Int) INIT: in: {} out: {a=D}
mark(try { a = 3 } finally { a = 5 }) INIT: in: {a=D} out: {a=D}
jmp?(L2)
3 mark({ a = 3 })
r(3) -> <v0>
w(a|<v0>) INIT: in: {a=D} out: {a=ID}
2 jmp(L3) INIT: in: {a=ID} out: {a=ID} USE: in: {a=WRITTEN_AFTER_READ} out: {a=WRITTEN_AFTER_READ}
L2 [onExceptionToFinallyBlock]:
L4 [start finally]:
3 mark({ a = 5 }) INIT: in: {a=D} out: {a=D}
r(5) -> <v2> USE: in: {a=ONLY_WRITTEN_NEVER_READ} out: {a=ONLY_WRITTEN_NEVER_READ}
w(a|<v2>) INIT: in: {a=D} out: {a=ID} USE: in: {} out: {a=ONLY_WRITTEN_NEVER_READ}
L5 [finish finally]:
2 jmp(error) INIT: in: {a=ID} out: {a=ID} USE: in: {} out: {}
L3 [skipFinallyToErrorBlock]:
L6 [copy of L2, onExceptionToFinallyBlock]:
3 mark({ a = 5 })
r(5) -> <v2> USE: in: {a=WRITTEN_AFTER_READ} out: {a=WRITTEN_AFTER_READ}
w(a|<v2>) USE: in: {a=READ} out: {a=WRITTEN_AFTER_READ}
2 merge(try { a = 3 } finally { a = 5 }|!<v1>) -> <v4>
mark(a.hashCode()) USE: in: {a=READ} out: {a=READ}
r(a) -> <v5> USE: in: {} out: {a=READ}
mark(hashCode())
call(hashCode(), hashCode|<v5>) -> <v6>
L1:
1 <END> INIT: in: {} out: {}
error:
<ERROR>
sink:
<SINK> USE: in: {} out: {}
=====================
compiler/testData/cfg-variables/bugs/kt9825.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
fun test5() {
var a: Int
try {
a = 3
}
finally {
a = 5
}
a.hashCode()
}
compiler/testData/cfg-variables/bugs/kt9825.values
Vendored
+24
View File
@@ -0,0 +1,24 @@
== test5 ==
fun test5() {
var a: Int
try {
a = 3
}
finally {
a = 5
}
a.hashCode()
}
---------------------
3 <v0>: Int NEW: r(3) -> <v0>
a = 3 !<v1>: *
{ a = 3 } !<v1>: * COPY
5 <v2>: Int NEW: r(5) -> <v2>
a = 5 !<v3>: *
{ a = 5 } !<v3>: * COPY
try { a = 3 } finally { a = 5 } <v4>: * NEW: merge(try { a = 3 } finally { a = 5 }|!<v1>) -> <v4>
a <v5>: OR{{<: Any}, {<: Any}} NEW: r(a) -> <v5>
hashCode() <v6>: * NEW: call(hashCode(), hashCode|<v5>) -> <v6>
a.hashCode() <v6>: * COPY
{ var a: Int try { a = 3 } finally { a = 5 } a.hashCode() } <v6>: * COPY
=====================
compiler/testData/diagnostics/tests/controlFlowAnalysis/assignedInFinally.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
fun test5() {
var a: Int
try {
<!UNUSED_VALUE!>a =<!> 3
}
finally {
a = 5
}
a.hashCode()
}
compiler/testData/diagnostics/tests/controlFlowAnalysis/assignedInFinally.txt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package
public fun test5(): kotlin.Unit
compiler/testData/diagnostics/tests/smartCasts/varnotnull/initInTryReturnInCatch.kt
Vendored
+2 -4
View File
@@ -59,8 +59,7 @@ fun test5() {
return
}
finally {
// Error: KT-9825
<!UNUSED_VALUE!>a =<!> 5
a = 5
}
<!DEBUG_INFO_SMARTCAST!>a<!>.hashCode() // a is never null here
}
@@ -73,8 +72,7 @@ fun test6() {
return
}
finally {
// Error: KT-9825
<!UNUSED_VALUE!>a =<!> null
a = null
}
<!DEBUG_INFO_CONSTANT!>a<!><!UNSAFE_CALL!>.<!>hashCode() // a is null here
}