Skip to content

Take inferred or explicit refinement result for unused check #23325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions compiler/src/dotty/tools/dotc/transform/CheckUnused.scala
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
override def prepareForValDef(tree: ValDef)(using Context): Context =
if !tree.symbol.is(Deferred) && tree.rhs.symbol != defn.Predef_undefined then
refInfos.register(tree)
tree.tpt match
case RefinedTypeTree(_, refinements) => relax(tree.rhs, refinements)
case _ =>
relax(tree.rhs, tree.tpt.tpe)
ctx
override def transformValDef(tree: ValDef)(using Context): tree.type =
traverseAnnotations(tree.symbol)
Expand All @@ -198,9 +196,7 @@ class CheckUnused private (phaseMode: PhaseMode, suffix: String) extends MiniPha
refInfos.inliners += 1
else if !tree.symbol.is(Deferred) && tree.rhs.symbol != defn.Predef_undefined then
refInfos.register(tree)
tree.tpt match
case RefinedTypeTree(_, refinements) => relax(tree.rhs, refinements)
case _ =>
relax(tree.rhs, tree.tpt.tpe)
ctx
override def transformDefDef(tree: DefDef)(using Context): tree.type =
traverseAnnotations(tree.symbol)
Expand Down Expand Up @@ -864,15 +860,21 @@ object CheckUnused:
case tree => traverseChildren(tree)

// NoWarn members in tree that correspond to refinements; currently uses only names.
def relax(tree: Tree, refinements: List[Tree])(using Context): Unit =
val names = refinements.collect { case named: NamedDefTree => named.name }.toSet
val relaxer = new TreeTraverser:
def traverse(tree: Tree)(using Context) =
tree match
case tree: NamedDefTree if names(tree.name) => tree.withAttachment(NoWarn, ())
case _ =>
traverseChildren(tree)
relaxer.traverse(tree)
def relax(tree: Tree, tpe: Type)(using Context): Unit =
def refinements(tpe: Type, names: List[Name]): List[Name] =
tpe match
case RefinedType(parent, refinedName, refinedInfo) => refinedName :: refinements(parent, names)
case _ => names
val refinedNames = refinements(tpe, Nil)
if !refinedNames.isEmpty then
val names = refinedNames.toSet
val relaxer = new TreeTraverser:
def traverse(tree: Tree)(using Context) =
tree match
case tree: NamedDefTree if names(tree.name) => tree.withAttachment(NoWarn, ())
case _ =>
traverseChildren(tree)
relaxer.traverse(tree)

extension (nm: Name)
inline def exists(p: Name => Boolean): Boolean = nm.ne(nme.NO_NAME) && p(nm)
Expand Down
10 changes: 4 additions & 6 deletions tests/warn/i22681.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@ trait T:

class C:
def f: Runnable { def u: Int } = new Runnable with T:
private def v = 42 // avoid g judged too trivial to warn
def run() = ()
def g = v // warn effectively private member is unused
def t = v // nowarn
def u = v // nowarn because leaked by refinement
def g = 42 // warn effectively private member is unused
def t = 42 // nowarn
def u = 42 // nowarn because leaked by refinement
val v: Runnable { def u: Int } = new Runnable:
private def v = 42 // avoid g judged too trivial to warn
def run() = ()
def u = v // nowarn because leaked by refinement
def u = 42 // nowarn because leaked by refinement
14 changes: 14 additions & 0 deletions tests/warn/i23323.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//> using options -Wunused:all

class C:
val x = new reflect.Selectable:
def f = 42
def g = 27
val y: Selectable = new reflect.Selectable:
def f = 42 // warn
def g = 27 // warn
val z = new scala.Selectable:
def f = 42
def g = 27
def selectDynamic(name: String): Any = ???
def applyDynamic(name: String)(args: Any*): Any = ???
Loading