Merge pull request #711 from dragos/issue/no-crash-missing-cpsParam

Don't crash if cpsParam is not on the classpath.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala b/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala
index 5b8e9baa21..464ffc6fab 100644
--- a/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala
+++ b/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala
@@ -4,6 +4,7 @@ package scala.tools.selectivecps
 
 import scala.tools.nsc.Global
 import scala.tools.nsc.typechecker.Modes
+import scala.tools.nsc.MissingRequirementError
 
 abstract class CPSAnnotationChecker extends CPSUtils with Modes {
   val global: Global
@@ -366,8 +367,9 @@ abstract class CPSAnnotationChecker extends CPSUtils with Modes {
      *  for a tree.  All this should do is add annotations. */
 
     override def addAnnotations(tree: Tree, tpe: Type): Type = {
+      import scala.util.control._
       if (!cpsEnabled) {
-        if (hasCpsParamTypes(tpe))
+        if (Exception.failAsValue(classOf[MissingRequirementError])(false)(hasCpsParamTypes(tpe)))
           global.reporter.error(tree.pos, "this code must be compiled with the Scala continuations plugin enabled")
         return tpe
       }