Control Flow: Fix CFG usage info for double-colon expressions
#KT-12551 Fixed #KT-17092 Fixed
This commit is contained in:
@@ -1450,9 +1450,8 @@ class ControlFlowProcessor(private val trace: BindingTrace) {
|
||||
val receiverExpression = expression.receiverExpression
|
||||
if (receiverExpression != null &&
|
||||
trace.bindingContext.get(BindingContext.DOUBLE_COLON_LHS, receiverExpression) is DoubleColonLHS.Expression) {
|
||||
// TODO: UNUSED_EXPRESSION is not reported on the whole expression, see KT-12551
|
||||
generateInstructions(receiverExpression)
|
||||
createSyntheticValue(expression, MagicKind.BOUND_CALLABLE_REFERENCE, receiverExpression)
|
||||
createNonSyntheticValue(expression, MagicKind.BOUND_CALLABLE_REFERENCE, receiverExpression)
|
||||
}
|
||||
else {
|
||||
createNonSyntheticValue(expression, MagicKind.UNBOUND_CALLABLE_REFERENCE)
|
||||
|
||||
+1
-1
@@ -134,7 +134,7 @@ enum class MagicKind(val sideEffectFree: Boolean = false) {
|
||||
IS(),
|
||||
CAST(),
|
||||
UNBOUND_CALLABLE_REFERENCE(true),
|
||||
BOUND_CALLABLE_REFERENCE(),
|
||||
BOUND_CALLABLE_REFERENCE(true),
|
||||
// implicit operations
|
||||
LOOP_RANGE_ITERATION(),
|
||||
IMPLICIT_RECEIVER(),
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
fun unusedExpression(s: String) {
|
||||
// TODO: report UNUSED_EXPRESSION (KT-12551)
|
||||
s::hashCode
|
||||
s::class
|
||||
<!UNUSED_EXPRESSION!>s::hashCode<!>
|
||||
<!UNUSED_EXPRESSION!>s::class<!>
|
||||
}
|
||||
|
||||
fun noUnusedParameter(s: String): Int {
|
||||
@@ -10,13 +9,13 @@ fun noUnusedParameter(s: String): Int {
|
||||
}
|
||||
|
||||
fun unreachableCode(): Int {
|
||||
(if (true) return 1 else return 0)::toString
|
||||
(if (true) return 1 else return 0)<!UNREACHABLE_CODE!>::toString<!>
|
||||
<!UNREACHABLE_CODE!>return 0<!>
|
||||
}
|
||||
|
||||
fun unreachableCodeInLoop(): Int {
|
||||
while (true) {
|
||||
(break)::toString
|
||||
(break)<!UNREACHABLE_CODE!>::toString<!>
|
||||
<!UNREACHABLE_CODE!>return 1<!>
|
||||
}
|
||||
return 2
|
||||
|
||||
@@ -7,5 +7,5 @@ fun f(<!UNUSED_PARAMETER!>x<!>: KClass<out Int>) {}
|
||||
fun test() {
|
||||
f(42::class)
|
||||
f((40 + 2)::class)
|
||||
42::toInt
|
||||
<!UNUSED_EXPRESSION!>42::toInt<!>
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user