summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2012-12-19 11:58:32 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2012-12-19 11:58:32 -0800
commit46ce4a4df186786b6b6adbb52f53542da5a8748b (patch)
treed9e88bc967607905dbe05c8151bb6f02aed2cb1c
parentc01d20d93015a5a9eef5068bfdf5af8d07e082d0 (diff)
parent0cbefd0e23bd38d270989d627a150f76b6ca9406 (diff)
downloadscala-46ce4a4df186786b6b6adbb52f53542da5a8748b.tar.gz
scala-46ce4a4df186786b6b6adbb52f53542da5a8748b.tar.bz2
scala-46ce4a4df186786b6b6adbb52f53542da5a8748b.zip
Merge pull request #1772 from gkossakowski/global-deadcode
Remove dead code from `Global`.
-rw-r--r--src/compiler/scala/tools/nsc/Global.scala2
-rw-r--r--src/compiler/scala/tools/nsc/Phases.scala1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
index 8883920325..757ac94dbd 100644
--- a/src/compiler/scala/tools/nsc/Global.scala
+++ b/src/compiler/scala/tools/nsc/Global.scala
@@ -779,7 +779,6 @@ class Global(var currentSettings: Settings, var reporter: Reporter)
/* The set of phase objects that is the basis for the compiler phase chain */
protected lazy val phasesSet = new mutable.HashSet[SubComponent]
protected lazy val phasesDescMap = new mutable.HashMap[SubComponent, String] withDefaultValue ""
- private lazy val phaseTimings = new Phases.TimingModel // tracking phase stats
protected def addToPhasesSet(sub: SubComponent, descr: String) {
phasesSet += sub
@@ -1584,7 +1583,6 @@ class Global(var currentSettings: Settings, var reporter: Reporter)
// progress update
informTime(globalPhase.description, startTime)
- phaseTimings(globalPhase) = currentTime - startTime
if (opt.writeICodeAtICode || (opt.printPhase && runIsAtOptimiz)) {
// Write *.icode files when -Xprint-icode or -Xprint:<some-optimiz-phase> was given.
diff --git a/src/compiler/scala/tools/nsc/Phases.scala b/src/compiler/scala/tools/nsc/Phases.scala
index c914344fd5..0901ade2d7 100644
--- a/src/compiler/scala/tools/nsc/Phases.scala
+++ b/src/compiler/scala/tools/nsc/Phases.scala
@@ -9,6 +9,7 @@ import symtab.Flags
import scala.reflect.internal.util.TableDef
import scala.language.postfixOps
+@deprecated("Scheduled for removal as being a dead-code in the compiler.", "2.10.1")
object Phases {
val MaxPhases = 64