diff options
author | Paul Phillips <paulp@improving.org> | 2010-12-11 14:57:06 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-12-11 14:57:06 +0000 |
commit | 262ee3a852f278f97b083a05376de0eab96c805d (patch) | |
tree | 482c62113aeb64e1bc7170610a958d58ec60cd19 /src | |
parent | 4cfcc156f404f574451d2ddcaf62326d32d0ef95 (diff) | |
download | scala-262ee3a852f278f97b083a05376de0eab96c805d.tar.gz scala-262ee3a852f278f97b083a05376de0eab96c805d.tar.bz2 scala-262ee3a852f278f97b083a05376de0eab96c805d.zip |
When was the last time -Xcheckinit was run? It ...
When was the last time -Xcheckinit was run? It must have been a long
time. All these changes are to address bugs revealed by -Xcheckinit,
mostly in test cases, some in the compiler. I'm guessing the partest
-Xcheckinit runs are hanging the first time they run into a failure, so
if it starts "working" again after this commit don't get too confident.
No review.
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 4 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/plugins/Plugins.scala | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index d1091a4b7c..327de376c0 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -603,8 +603,8 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable lazy val phaseDescriptors: List[SubComponent] = computePhaseDescriptors /* The set of phase objects that is the basis for the compiler phase chain */ - protected val phasesSet = new mutable.HashSet[SubComponent] - protected val phasesDescMap = new mutable.HashMap[SubComponent, String] withDefaultValue "" + protected lazy val phasesSet = new mutable.HashSet[SubComponent] + protected lazy val phasesDescMap = new mutable.HashMap[SubComponent, String] withDefaultValue "" protected def addToPhasesSet(sub: SubComponent, descr: String) { phasesSet += sub phasesDescMap(sub) = descr diff --git a/src/compiler/scala/tools/nsc/plugins/Plugins.scala b/src/compiler/scala/tools/nsc/plugins/Plugins.scala index c798fa89e1..24962ee085 100644 --- a/src/compiler/scala/tools/nsc/plugins/Plugins.scala +++ b/src/compiler/scala/tools/nsc/plugins/Plugins.scala @@ -15,8 +15,7 @@ import io.{ File, Path } * @version 1.1, 2009/1/2 * Updated 2009/1/2 by Anders Bach Nielsen: Added features to implement SIP 00002 */ -trait Plugins -{ +trait Plugins { self: Global => /** Load a rough list of the plugins. For speed, it |