@@ -52,6 +52,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
52
52
tree
53
53
54
54
override def transformIdent (tree : Ident )(using Context ): tree.type =
55
+ refInfos.isAssignment = tree.hasAttachment(AssignmentTarget )
55
56
if tree.symbol.exists then
56
57
// if in an inline expansion, resolve at summonInline (synthetic pos) or in an enclosing call site
57
58
val resolving =
@@ -68,10 +69,12 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
68
69
resolveUsage(tree.symbol, tree.name, tree.typeOpt.importPrefix.skipPackageObject)
69
70
else if tree.hasType then
70
71
resolveUsage(tree.tpe.classSymbol, tree.name, tree.tpe.importPrefix.skipPackageObject)
72
+ refInfos.isAssignment = false
71
73
tree
72
74
73
75
// import x.y; y may be rewritten x.y, also import x.z as y
74
76
override def transformSelect (tree : Select )(using Context ): tree.type =
77
+ refInfos.isAssignment = tree.hasAttachment(AssignmentTarget )
75
78
val name = tree.removeAttachment(OriginalName ).getOrElse(nme.NO_NAME )
76
79
inline def isImportable = tree.qualifier.srcPos.isSynthetic
77
80
&& tree.qualifier.tpe.match
@@ -92,6 +95,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
92
95
resolveUsage(tree.symbol, name, tree.qualifier.tpe)
93
96
else if ! ignoreTree(tree) then
94
97
refUsage(tree.symbol)
98
+ refInfos.isAssignment = false
95
99
tree
96
100
97
101
override def transformLiteral (tree : Literal )(using Context ): tree.type =
@@ -113,13 +117,10 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
113
117
ctx
114
118
115
119
override def prepareForAssign (tree : Assign )(using Context ): Context =
116
- tree.lhs.putAttachment(Ignore , ()) // don't take LHS reference as a read
120
+ tree.lhs.putAttachment(AssignmentTarget , ()) // don't take LHS reference as a read
117
121
ctx
118
122
override def transformAssign (tree : Assign )(using Context ): tree.type =
119
- tree.lhs.removeAttachment(Ignore )
120
- val sym = tree.lhs.symbol
121
- if sym.exists then
122
- refInfos.asss.addOne(sym)
123
+ tree.lhs.removeAttachment(AssignmentTarget )
123
124
tree
124
125
125
126
override def prepareForMatch (tree : Match )(using Context ): Context =
@@ -276,7 +277,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
276
277
// if sym is not an enclosing element, record the reference
277
278
def refUsage (sym : Symbol )(using Context ): Unit =
278
279
if ! ctx.outersIterator.exists(cur => cur.owner eq sym) then
279
- refInfos.refs.addOne (sym)
280
+ refInfos.addRef (sym)
280
281
281
282
/** Look up a reference in enclosing contexts to determine whether it was introduced by a definition or import.
282
283
* The binding of highest precedence must then be correct.
@@ -335,7 +336,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
335
336
case none =>
336
337
337
338
// Avoid spurious NoSymbol and also primary ctors which are never warned about.
338
- // Selections C.this.toString should be already excluded, but backtopped here for eq, etc.
339
+ // Selections C.this.toString should be already excluded, but backstopped here for eq, etc.
339
340
if ! sym.exists || sym.isPrimaryConstructor || sym.isEffectiveRoot || defn.topClasses(sym.owner) then return
340
341
341
342
// Find the innermost, highest precedence. Contexts have no nesting levels but assume correctness.
@@ -404,7 +405,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
404
405
candidate = cur
405
406
end while
406
407
// record usage and possibly an import
407
- refInfos.refs.addOne (sym)
408
+ refInfos.addRef (sym)
408
409
if candidate != NoContext && candidate.isImportContext && importer != null then
409
410
refInfos.sels.put(importer, ())
410
411
// possibly record that we have performed this look-up
@@ -443,6 +444,9 @@ object CheckUnused:
443
444
/** Ignore reference. */
444
445
val Ignore = Property .StickyKey [Unit ]
445
446
447
+ /** Tree is LHS of Assign. */
448
+ val AssignmentTarget = Property .StickyKey [Unit ]
449
+
446
450
class PostTyper extends CheckUnused (PhaseMode .Aggregate , " PostTyper" )
447
451
448
452
class PostInlining extends CheckUnused (PhaseMode .Report , " PostInlining" )
@@ -487,6 +491,14 @@ object CheckUnused:
487
491
488
492
val inlined = Stack .empty[SrcPos ] // enclosing call.srcPos of inlined code (expansions)
489
493
var inliners = 0 // depth of inline def (not inlined yet)
494
+
495
+ // instead of refs.addOne, use addRef to distinguish a read from a write to var
496
+ var isAssignment = false
497
+ def addRef (sym : Symbol ): Unit =
498
+ if isAssignment then
499
+ asss.addOne(sym)
500
+ else
501
+ refs.addOne(sym)
490
502
end RefInfos
491
503
492
504
// Symbols already resolved in the given Context (with name and prefix of lookup).
0 commit comments