Collect nowarn symbols instead of skipping them

Author: som-snytt

compiler/src/dotty/tools/dotc/transform/CheckUnused.scala

@@ -450,6 +450,7 @@ object CheckUnused:
     val refs = mutable.Set.empty[Symbol]              // references
     val asss = mutable.Set.empty[Symbol]              // targets of assignment
     val skip = mutable.Set.empty[Symbol]              // methods to skip (don't warn about their params)
+    val nowarn = mutable.Set.empty[Symbol]            // marked @nowarn
     val imps = new IdentityHashMap[Import, Unit]         // imports
     val sels = new IdentityHashMap[ImportSelector, Unit] // matched selectors
     def register(tree: Tree)(using Context): Unit = if inlined.isEmpty then
@@ -462,17 +463,20 @@ object CheckUnused:
         then
           imps.put(imp, ())
       case tree: Bind =>
-        if !tree.name.isInstanceOf[DerivedName] && !tree.name.is(WildcardParamName) && !tree.hasAttachment(NoWarn) then
+        if !tree.name.isInstanceOf[DerivedName] && !tree.name.is(WildcardParamName) then
+          if tree.hasAttachment(NoWarn) then
+            nowarn.addOne(tree.symbol)
           pats.addOne((tree.symbol, tree.namePos))
       case tree: ValDef if tree.hasAttachment(PatternVar) =>
         if !tree.name.isInstanceOf[DerivedName] then
           pats.addOne((tree.symbol, tree.namePos))
       case tree: NamedDefTree =>
         if (tree.symbol ne NoSymbol)
           && !tree.name.isWildcard
-          && !tree.hasAttachment(NoWarn)
           && !tree.symbol.is(ModuleVal) // track only the ModuleClass using the object symbol, with correct namePos
         then
+          if tree.hasAttachment(NoWarn) then
+            nowarn.addOne(tree.symbol)
           defs.addOne((tree.symbol.userSymbol, tree.namePos))
       case _ =>
         if tree.symbol ne NoSymbol then
@@ -634,7 +638,7 @@ object CheckUnused:
       val byPos = infos.pats.groupMap(uniformPos(_, _))((sym, pos) => sym)
       for (pos, syms) <- byPos if pos.span.exists && !syms.exists(_.hasAnnotation(defn.UnusedAnnot)) do
         if !syms.exists(infos.refs(_)) then
-          if !syms.exists(v => !v.isLocal && !v.is(Private)) then
+          if !syms.exists(v => !v.isLocal && !v.is(Private) || infos.nowarn(v)) then
             warnAt(pos)(UnusedSymbol.patVars)
         else if syms.exists(_.is(Mutable)) then // check unassigned var
           val sym = // recover the original

tests/warn/i15503d.scala

@@ -22,7 +22,7 @@ case class K(i: Int, j: Int)
 
 class C(c0: Option[Int], k0: K):
   private val Some(c) = c0: @unchecked  // warn valdef from pattern
-  private val K(i, j) = k0              // warn // warn valdefs from pattern (RHS patvars are NoWarn)
+  private val K(i, j) = k0              // nowarn (name of case class element is nowarn)
   val K(v, w) = k0                      // nowarn nonprivate
   private val K(r, s) = k0              // warn // warn valdefs from pattern
   def f(x: Option[Int]) = x match

tests/warn/t13095.scala

@@ -0,0 +1,10 @@
+//> using options -Wunused:patvars -Werror
+
+case class A(x: Int, y: Int)
+
+object Main {
+  for {
+    a <- List.empty[A]
+    A(x, y) = a
+  } yield x + y
+}