Merge pull request #2647 from dotty-staging/localopt-continued

Local optimisations round two

Author: DarkDimius

compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala

@@ -173,7 +173,7 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
 
   val primitives: Primitives = new Primitives {
     val primitives = new DottyPrimitives(ctx)
-    def getPrimitive(app: Apply, reciever: Type): Int = primitives.getPrimitive(app, reciever)
+    def getPrimitive(app: Apply, receiver: Type): Int = primitives.getPrimitive(app, receiver)
 
     def getPrimitive(sym: Symbol): Int = primitives.getPrimitive(sym)
 

compiler/src/dotty/tools/dotc/Compiler.scala

@@ -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`.

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -107,7 +107,9 @@ class ScalaSettings extends Settings.SettingGroup {
   val YnoInline = BooleanSetting("-Yno-inline", "Suppress inlining.")
 
   /** Linker specific flags */
-  val optimise = BooleanSetting("-optimise", "Generates faster bytecode by applying optimisations to the program") withAbbreviation "-optimize"
+  val YoptPhases = PhasesSetting("-Yopt-phases", "Restrict the optimisation phases to execute under -optimise.")
+  val YoptFuel = IntSetting("-Yopt-fuel", "Maximum number of optimisations performed under -optimise.", -1)
+  val optimise = BooleanSetting("-optimise", "Generates faster bytecode by applying local optimisations to the .program") withAbbreviation "-optimize"
 
   /** Dottydoc specific settings */
   val siteRoot = StringSetting(

compiler/src/dotty/tools/dotc/core/Definitions.scala

@@ -368,7 +368,6 @@ 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)

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

@@ -1,5 +1,6 @@
 package dotty.tools.dotc
 package transform
+
 import core.Contexts.Context
 
 /** Utility class for lazy values whose evaluation depends on a context.
@@ -20,4 +21,4 @@ class CtxLazy[T](expr: Context => T) {
     }
     myValue
   }
-}
+}