fixed double-loading of plugins.

4 files changed, 12 insertions, 9 deletions

diff --git a/src/compiler/scala/tools/nsc/plugins/Plugin.scala b/src/compiler/scala/tools/nsc/plugins/Plugin.scala
index 92dcd6c534..f527441c68 100644
--- a/src/compiler/scala/tools/nsc/plugins/Plugin.scala
+++ b/src/compiler/scala/tools/nsc/plugins/Plugin.scala
@@ -131,13 +131,13 @@ object Plugin {
     dirs: List[Path],
     ignoring: List[String]): List[AnyClass] =
   {
-    val alljars = jars ::: (for {
+    val alljars = (jars ::: (for {
       dir <- dirs if dir.isDirectory
       entry <- dir.toDirectory.files.toList sortBy (_.name)
       if entry.extension == "jar"
       pdesc <- loadDescription(entry)
       if !(ignoring contains pdesc.name)
-    } yield entry)
+    } yield entry)).distinct
 
     val loader = loaderFor(alljars)
     alljars map (loadFrom(_, loader)) flatten
diff --git a/src/compiler/scala/tools/nsc/plugins/Plugins.scala b/src/compiler/scala/tools/nsc/plugins/Plugins.scala
index 90d306614a..8a86c982d9 100644
--- a/src/compiler/scala/tools/nsc/plugins/Plugins.scala
+++ b/src/compiler/scala/tools/nsc/plugins/Plugins.scala
@@ -30,10 +30,10 @@ trait Plugins
     val dirs = (settings.pluginsDir.value split File.pathSeparator).toList map Path.apply
     val classes = Plugin.loadAllFrom(jars, dirs, settings.disable.value)
 
-    classes foreach (c => Plugin.instantiate(c, this))
-
-    for (plugClass <- Plugin.loadAllFrom(jars, dirs, settings.disable.value))
-    yield Plugin.instantiate(plugClass, this)
+    // Lach plugin must only be instantiated once. A commong pattern
+    // is to register annotation checkers during object construction, so
+    // creating multiple plugin instances will leave behind stale checkers. s
+    classes map (Plugin.instantiate(_, this))
   }
 
   protected lazy val roughPluginsList: List[Plugin] = loadRoughPluginsList
diff --git a/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala b/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala
index 6acc685dc2..a1112fa3c8 100644
--- a/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala
+++ b/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala
@@ -380,7 +380,11 @@ abstract class CPSAnnotationChecker extends CPSUtils {
      *  for a tree.  All this should do is add annotations. */
 
     override def addAnnotations(tree: Tree, tpe: Type): Type = {
-      if (!cpsEnabled) return tpe
+      if (!cpsEnabled) {
+        if (tpe.hasAnnotation(MarkerCPSTypes))
+          global.reporter.error(tree.pos, "this code must be compiled with the Scala continuations plugin enabled")
+        return tpe
+      }
 
 //      if (tree.tpe.hasAnnotation(MarkerCPSAdaptPlus))
 //        println("addAnnotation " + tree + "/" + tpe)
diff --git a/src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSPlugin.scala b/src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSPlugin.scala
index 7c56a78491..a16e9b9a4c 100644
--- a/src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSPlugin.scala
+++ b/src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSPlugin.scala
@@ -33,6 +33,7 @@ class SelectiveCPSPlugin(val global: Global) extends Plugin {
   }
   global.addAnnotationChecker(checker.checker)
 
+  global.log("instantiated cps plugin: " + this)
 
   def setEnabled(flag: Boolean) = {
     checker.cpsEnabled = flag
@@ -56,6 +57,4 @@ class SelectiveCPSPlugin(val global: Global) extends Plugin {
 
   override val optionsHelp: Option[String] =
     Some("  -P:continuations:enable        Enable continuations")
-//       "  -sourcepath <path>             Specify where to find input source files"
-
 }