diff options
Diffstat (limited to 'src/compiler/scala/tools/nsc/Global.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 8746a7fd8d..05d0bcf6b0 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -16,7 +16,6 @@ import scala.reflect.internal.util.{ OffsetPosition, SourceFile, NoSourceFile, B import scala.reflect.internal.pickling.{ PickleBuffer, PickleFormat } import symtab.{ Flags, SymbolTable, SymbolLoaders, SymbolTrackers } import symtab.classfile.Pickler -import dependencies.DependencyAnalysis import plugins.Plugins import ast._ import ast.parser._ @@ -329,9 +328,6 @@ class Global(var currentSettings: Settings, var reporter: Reporter) } } - if (!dependencyAnalysis.off) - dependencyAnalysis.loadDependencyAnalysis() - if (settings.verbose.value || settings.Ylogcp.value) { // Uses the "do not truncate" inform informComplete("[search path for source files: " + classPath.sourcepaths.mkString(",") + "]") @@ -606,14 +602,6 @@ class Global(var currentSettings: Settings, var reporter: Reporter) val runsRightAfter = None } with GenASM - // This phase is optional: only added if settings.make option is given. - // phaseName = "dependencyAnalysis" - object dependencyAnalysis extends { - val global: Global.this.type = Global.this - val runsAfter = List("jvm") - val runsRightAfter = None - } with DependencyAnalysis - // phaseName = "terminal" object terminal extends { val global: Global.this.type = Global.this @@ -1472,8 +1460,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter) } /** Compile list of source files */ - def compileSources(_sources: List[SourceFile]) { - val sources = dependencyAnalysis calculateFiles _sources.distinct + def compileSources(sources: List[SourceFile]) { // there is a problem already, e.g. a plugin was passed a bad option if (reporter.hasErrors) return @@ -1568,10 +1555,6 @@ class Global(var currentSettings: Settings, var reporter: Reporter) symSource.keys foreach (x => resetPackageClass(x.owner)) informTime("total", startTime) - // record dependency data - if (!dependencyAnalysis.off) - dependencyAnalysis.saveDependencyAnalysis() - // Clear any sets or maps created via perRunCaches. perRunCaches.clearAll() |