A revival of r21442, which I had reverted based...

A revival of r21442, which I had reverted based on the mistaken belief
it was causing mysterious trunk issues of the day. No review.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/compiler/scala/tools/nsc/Interpreter.scala b/src/compiler/scala/tools/nsc/Interpreter.scala
index 17f543f8e3..0200773e05 100644
--- a/src/compiler/scala/tools/nsc/Interpreter.scala
+++ b/src/compiler/scala/tools/nsc/Interpreter.scala
@@ -20,7 +20,7 @@ import scala.reflect.Manifest
 import scala.collection.mutable.{ ListBuffer, HashSet, HashMap, ArrayBuffer }
 import scala.tools.nsc.util.ScalaClassLoader
 import ScalaClassLoader.URLClassLoader
-import scala.util.control.Exception.{ Catcher, catching, ultimately, unwrapping }
+import scala.util.control.Exception.{ Catcher, catching, catchingPromiscuously, ultimately, unwrapping }
 
 import io.{ PlainFile, VirtualDirectory }
 import reporters.{ ConsoleReporter, Reporter }
@@ -981,7 +981,7 @@ class Interpreter(val settings: Settings, out: PrintWriter) {
           }
       }
 
-      catching(onErr) {
+      catchingPromiscuously(onErr) {
         unwrapping(wrapperExceptions: _*) {
           (resultValMethod.invoke(loadedResultObject).toString, true)
         }