Introduces "Origins" for all your superhero bac...

Introduces "Origins" for all your superhero backstory needs. It logs
where all the calls are coming from: that's all for the moment. It's
explained in the comments and test case, so I'm sure you don't need it
all repeated here. No review.

1 files changed, 1 insertions, 9 deletions

diff --git a/src/compiler/scala/tools/nsc/ScriptRunner.scala b/src/compiler/scala/tools/nsc/ScriptRunner.scala
index 6f5f2936a8..c432e1c9f0 100644
--- a/src/compiler/scala/tools/nsc/ScriptRunner.scala
+++ b/src/compiler/scala/tools/nsc/ScriptRunner.scala
@@ -16,7 +16,7 @@ import io.{ Directory, File, Path, PlainFile }
 import java.net.URL
 import java.util.jar.{ JarEntry, JarOutputStream }
 
-import util.waitingForThreads
+import util.{ waitingForThreads, addShutdownHook }
 import scala.tools.util.PathResolver
 import scala.tools.nsc.reporters.{Reporter,ConsoleReporter}
 
@@ -56,14 +56,6 @@ object ScriptRunner {
   /** Default name to use for the wrapped script */
   val defaultScriptMain = "Main"
 
-  /** Must be a daemon thread else scripts won't shut down: ticket #3678 */
-  private def addShutdownHook(body: => Unit) =
-    Runtime.getRuntime addShutdownHook {
-      val t = new Thread { override def run { body } }
-      t setDaemon true
-      t
-    }
-
   /** Pick a main object name from the specified settings */
   def scriptMain(settings: Settings) = settings.script.value match {
     case "" => defaultScriptMain