@@ -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 =
@@ -291,7 +292,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
291
292
// if sym is not an enclosing element, record the reference
292
293
def refUsage (sym : Symbol )(using Context ): Unit =
293
294
if ! ctx.outersIterator.exists(cur => cur.owner eq sym) then
294
- refInfos.refs.addOne (sym)
295
+ refInfos.addRef (sym)
295
296
296
297
/** Look up a reference in enclosing contexts to determine whether it was introduced by a definition or import.
297
298
* The binding of highest precedence must then be correct.
@@ -341,7 +342,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
341
342
&& ctxsym.thisType.member(sym.name).hasAltWith(d => d.containsSym(sym) && ! name.exists(_ != d.name))
342
343
343
344
// Avoid spurious NoSymbol and also primary ctors which are never warned about.
344
- // Selections C.this.toString should be already excluded, but backtopped here for eq, etc.
345
+ // Selections C.this.toString should be already excluded, but backstopped here for eq, etc.
345
346
if ! sym.exists || sym.isPrimaryConstructor || sym.isEffectiveRoot || defn.topClasses(sym.owner) then return
346
347
347
348
// Find the innermost, highest precedence. Contexts have no nesting levels but assume correctness.
@@ -392,7 +393,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
392
393
end while
393
394
// record usage and possibly an import
394
395
if ! enclosed then
395
- refInfos.refs.addOne (sym)
396
+ refInfos.addRef (sym)
396
397
if candidate != NoContext && candidate.isImportContext && importer != null then
397
398
refInfos.sels.put(importer, ())
398
399
end resolveUsage
@@ -417,6 +418,9 @@ object CheckUnused:
417
418
/** Ignore reference. */
418
419
val Ignore = Property .StickyKey [Unit ]
419
420
421
+ /** Tree is LHS of Assign. */
422
+ val AssignmentTarget = Property .StickyKey [Unit ]
423
+
420
424
class PostTyper extends CheckUnused (PhaseMode .Aggregate , " PostTyper" )
421
425
422
426
class PostInlining extends CheckUnused (PhaseMode .Report , " PostInlining" )
@@ -461,6 +465,14 @@ object CheckUnused:
461
465
462
466
val inlined = Stack .empty[SrcPos ] // enclosing call.srcPos of inlined code (expansions)
463
467
var inliners = 0 // depth of inline def (not inlined yet)
468
+
469
+ // instead of refs.addOne, use addRef to distinguish a read from a write to var
470
+ var isAssignment = false
471
+ def addRef (sym : Symbol ): Unit =
472
+ if isAssignment then
473
+ asss.addOne(sym)
474
+ else
475
+ refs.addOne(sym)
464
476
end RefInfos
465
477
466
478
// Names are resolved by definitions and imports, which have four precedence levels:
0 commit comments