Skip to content

Local optimisations round two #2647

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

Merged
merged 16 commits into from
Jun 14, 2017
Merged

Local optimisations round two #2647

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
328357c
Split Simplify.scala in 15 files
OlivierBlanvillain May 31, 2017
e93b499
Add -Yopt-phases, -Yopt-fuel, bisect.sh, update main Simplify loop
OlivierBlanvillain Jun 2, 2017
257954c
DropNoEffects: fix first bootstrap bug
OlivierBlanvillain Jun 6, 2017
0ed8e0a
DropNoEffects: comments and formating
OlivierBlanvillain Jun 6, 2017
9c152e8
DropNoEffects: Remove TypeApply case, this is covered by DropGoodCasts
OlivierBlanvillain Jun 7, 2017
03c0ca6
Typo: receiver → receiver
OlivierBlanvillain Jun 7, 2017
f6e4632
Formatting, adressing smarter comments
OlivierBlanvillain Jun 7, 2017
d69cd13
Improve Simplify's documentation
DarkDimius Jun 9, 2017
ba0caa8
Use getSimpleName
DarkDimius Jun 12, 2017
93e1b6d
Collapse ctx and localCtx together
DarkDimius Jun 12, 2017
a386f63
Guard fuel with a private final val
DarkDimius Jun 12, 2017
ff91037
InlineCaseIntrinsics: add .simplified to fix new-unfriendy types
OlivierBlanvillain Jun 9, 2017
195d5e6
Clean up
OlivierBlanvillain Jun 12, 2017
2a666d8
Revert parts of the refactoring
OlivierBlanvillain Jun 13, 2017
45232ba
Bootstrap with -optimise
OlivierBlanvillain Jun 13, 2017
4be324e
Revert moving definitions to Definitions
OlivierBlanvillain Jun 14, 2017
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
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/Compiler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import core.DenotTransformers.DenotTransformer
import core.Denotations.SingleDenotation

import dotty.tools.backend.jvm.{LabelDefs, GenBCode, CollectSuperCalls}
import dotty.tools.dotc.transform.linker.Simplify
import dotty.tools.dotc.transform.localopt.Simplify

/** The central class of the dotc compiler. The job of a compiler is to create
* runs, which process given `phases` in a given `rootContext`.
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/dotc/core/Definitions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,11 +368,12 @@ class Definitions {

lazy val SeqType: TypeRef = ctx.requiredClassRef("scala.collection.Seq")
def SeqClass(implicit ctx: Context) = SeqType.symbol.asClass

lazy val Seq_applyR = SeqClass.requiredMethodRef(nme.apply)
def Seq_apply(implicit ctx: Context) = Seq_applyR.symbol
lazy val Seq_headR = SeqClass.requiredMethodRef(nme.head)
def Seq_head(implicit ctx: Context) = Seq_headR.symbol
lazy val SeqFactoryType: TypeRef = ctx.requiredClassRef("scala.collection.generic.SeqFactory")
def SeqFactoryClass(implicit ctx: Context) = SeqFactoryType.symbol.asClass

lazy val ArrayType: TypeRef = ctx.requiredClassRef("scala.Array")
def ArrayClass(implicit ctx: Context) = ArrayType.symbol.asClass
Expand Down Expand Up @@ -447,6 +448,8 @@ class Definitions {
def Long_* = Long_mulR.symbol
lazy val Long_divR = LongClass.requiredMethodRef(nme.DIV, List(LongType))
def Long_/ = Long_divR.symbol
val CommutativePrimitiveOperations = new PerRun[collection.Set[Symbol]](implicit ctx =>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't put stuff inside Definitions, unless its frequently used by multiple phases.

Same applies for SeqFactoryType.

Set(defn.Boolean_&&, defn.Boolean_||, defn.Int_+, defn.Int_*, defn.Long_+, defn.Long_*))

lazy val FloatType: TypeRef = valueTypeRef("scala.Float", BoxedFloatType, java.lang.Float.TYPE, FloatEnc)
def FloatClass(implicit ctx: Context) = FloatType.symbol.asClass
Expand Down
69 changes: 0 additions & 69 deletions compiler/src/dotty/tools/dotc/transform/linker/Analysis.scala
View file
Open in desktop

This file was deleted.

Loading