Skip to content
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.

Sign up for GitHub

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

Jump to bottom

WIP more lambda blasting in Typers #40

Open
wants to merge 2 commits into
base: 2.12.x
Choose a base branch
from
Open

WIP more lambda blasting in Typers #40

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dfe657
Avoid lambda allocation inside loop in typedStats
retronym Mar 8, 2019
7ae2e67
Hoist lambda allocation out of tight loop in Typer.addLocals
retronym Mar 8, 2019
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
49 changes: 27 additions & 22 deletions src/compiler/scala/tools/nsc/typechecker/Typers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3321,17 +3321,19 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper

(!sym.isModule || shouldAddAsModule) && (inBlock || !context.isInPackageObject(sym, context.owner))
}
for (sym <- scope)
// OPT: shouldAdd is usually true. Call it here, rather than in the outer loop
for (tree <- context.unit.synthetics.get(sym) if shouldAdd(sym)) {
// if the completer set the IS_ERROR flag, retract the stat (currently only used by applyUnapplyMethodCompleter)
if (!sym.initialize.hasFlag(IS_ERROR))
newStats += typedStat(tree) // might add even more synthetics to the scope
context.unit.synthetics -= sym
for (sym <- scope) {
context.unit.synthetics.get(sym) match {
case Some(tree) if shouldAdd(sym) => // OPT: shouldAdd is more expensive than usually the map look and usually true. Call it here, rather than in the outer loop
// if the completer set the IS_ERROR flag, retract the stat (currently only used by applyUnapplyMethodCompleter)
if (!sym.initialize.hasFlag(IS_ERROR))
newStats += typedStat(tree) // might add even more synthetics to the scope
context.unit.synthetics -= sym
case _ =>
}
// the type completer of a synthetic might add more synthetics. example: if the
// factory method of a case class (i.e. the constructor) has a default.
moreToAdd = scope.elems ne initElems
// the type completer of a synthetic might add more synthetics. example: if the
// factory method of a case class (i.e. the constructor) has a default.
moreToAdd = scope.elems ne initElems
}
}
if (newStats.isEmpty) stats
else {
Expand Down Expand Up @@ -4108,23 +4110,26 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
}
}

// OPT: hoist lambda out of type map below.
lazy val addIdentIfLocal = (arg: Tree) => {
arg match {
case Ident(_) =>
// Check the symbol of an Ident, unless the
// Ident's type is already over an existential.
// (If the type is already over an existential,
// then remap the type, not the core symbol.)
if (!arg.tpe.typeSymbol.hasFlag(EXISTENTIAL))
addIfLocal(arg.symbol, arg.tpe)
case _ => ()
}
}

for (t <- tp) {
t match {
case ExistentialType(tparams, _) =>
boundSyms ++= tparams
case AnnotatedType(annots, _) =>
for (annot <- annots; arg <- annot.args) {
arg match {
case Ident(_) =>
// Check the symbol of an Ident, unless the
// Ident's type is already over an existential.
// (If the type is already over an existential,
// then remap the type, not the core symbol.)
if (!arg.tpe.typeSymbol.hasFlag(EXISTENTIAL))
addIfLocal(arg.symbol, arg.tpe)
case _ => ()
}
}
annots.foreach(_.args.foreach(addIdentIfLocal))
case _ =>
}
addIfLocal(t.termSymbol, t)
Expand Down