diff options
author | Guillaume Martres <smarter@ubuntu.com> | 2017-04-13 21:14:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-13 21:14:28 +0200 |
commit | 9e45ad16d012e6a2ff3be411c2fe101b1c74b831 (patch) | |
tree | 3f8af20f82bbee9ace7f5a39f97f9b64778b38b4 /compiler/src/dotty/tools | |
parent | 975f7efab69e8e5a23db665f33dceecb0bf6ceaa (diff) | |
parent | 476778612e71379cf648693f7d02039301fb5607 (diff) | |
download | dotty-9e45ad16d012e6a2ff3be411c2fe101b1c74b831.tar.gz dotty-9e45ad16d012e6a2ff3be411c2fe101b1c74b831.tar.bz2 dotty-9e45ad16d012e6a2ff3be411c2fe101b1c74b831.zip |
Merge pull request #2260 from dotty-staging/backend-submodule
Fix #2184: Hyper Bootstrap! Integrate the backend as a git submodule
Diffstat (limited to 'compiler/src/dotty/tools')
-rw-r--r-- | compiler/src/dotty/tools/backend/jvm/GenBCode.scala | 6 | ||||
-rw-r--r-- | compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/compiler/src/dotty/tools/backend/jvm/GenBCode.scala b/compiler/src/dotty/tools/backend/jvm/GenBCode.scala index 8fd6d1bc0..25a8061ac 100644 --- a/compiler/src/dotty/tools/backend/jvm/GenBCode.scala +++ b/compiler/src/dotty/tools/backend/jvm/GenBCode.scala @@ -8,7 +8,6 @@ import dotty.tools.dotc.core.Names.TypeName import scala.collection.mutable import scala.tools.asm.{ClassVisitor, CustomAttr, FieldVisitor, MethodVisitor} -import scala.tools.nsc.Settings import scala.tools.nsc.backend.jvm._ import dotty.tools.dotc import dotty.tools.dotc.backend.jvm.DottyPrimitives @@ -35,7 +34,6 @@ import tpd._ import StdNames._ import scala.reflect.io.{AbstractFile, Directory, PlainDirectory} -import scala.tools.nsc.backend.jvm.opt.LocalOpt class GenBCode extends Phase { def phaseName: String = "genBCode" @@ -246,10 +244,10 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter * - converting the plain ClassNode to byte array and placing it on queue-3 */ class Worker2 { - lazy val localOpt = new LocalOpt(new Settings()) + // lazy val localOpt = new LocalOpt(new Settings()) def localOptimizations(classNode: ClassNode): Unit = { - /*BackendStats.timed(BackendStats.methodOptTimer)*/(localOpt.methodOptimizations(classNode)) + // BackendStats.timed(BackendStats.methodOptTimer)(localOpt.methodOptimizations(classNode)) } def run(): Unit = { diff --git a/compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala b/compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala index 7beae90c4..851cacaa2 100644 --- a/compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala +++ b/compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala @@ -37,7 +37,7 @@ import core.Symbols.{Symbol, NoSymbol} * Inspired from the `scalac` compiler. */ class DottyPrimitives(ctx: Context) { - import scala.tools.nsc.backend.ScalaPrimitives._ + import scala.tools.nsc.backend.ScalaPrimitivesOps._ private lazy val primitives: immutable.Map[Symbol, Int] = init |