Skip to content

Make isEffectivelyMutable tailrec #3154

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

Merged
merged 1 commit into from
Sep 25, 2017
Merged
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
10 changes: 8 additions & 2 deletions compiler/src/dotty/tools/dotc/transform/localopt/Simplify.scala
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import transform.TreeTransforms.{MiniPhaseTransform, TransformerInfo}
import config.Printers.simplify
import ast.tpd

import scala.annotation.tailrec

/** This phase consists of a series of small, simple, local optimisations
* applied as a fix point transformation over Dotty Trees.
*
Expand Down Expand Up @@ -160,10 +162,14 @@ object Simplify {
* System members are the only static final fields that are mutable.
* See https://docs.oracle.com/javase/specs/jls/se8/html/jls-17.html#jls-17.5.4
*/
def isEffectivelyMutable(t: Tree)(implicit ctx: Context): Boolean = t match {
@tailrec def isEffectivelyMutable(t: Tree)(implicit ctx: Context): Boolean = t match {
case _ if t.symbol.is(Mutable) => true
case s: Select => s.symbol.owner == defn.SystemModule
case i: Ident => desugarIdent(i).exists(isEffectivelyMutable)
case i: Ident =>
desugarIdent(i) match {
case Some(ident) => isEffectivelyMutable(ident)
case None => false
}
case _ => false
}

Expand Down