Revert "Check that 'info' is only called on the...

Revert "Check that 'info' is only called on the presentation compiler
thread. This is a temporary debugging option"

This reverts commit 29329aa84a1f8cff4ff866044faf2490a39dadd5.

4 files changed, 8 insertions, 36 deletions

diff --git a/src/compiler/scala/reflect/internal/SymbolTable.scala b/src/compiler/scala/reflect/internal/SymbolTable.scala
index dd0994a1f6..5c4d44f735 100644
--- a/src/compiler/scala/reflect/internal/SymbolTable.scala
+++ b/src/compiler/scala/reflect/internal/SymbolTable.scala
@@ -31,10 +31,6 @@ abstract class SymbolTable extends /*reflect.generic.Universe
   def abort(msg: String): Nothing = throw new Error(msg)
   def abort(): Nothing = throw new Error()
 
-  /** Check that the executing thread is the compiler thread. No-op here,
-   *  overridden in interactive.Global. */
-  def assertCorrectThread() {}
-
   /** Are we compiling for Java SE? */
   // def forJVM: Boolean
 
diff --git a/src/compiler/scala/reflect/internal/Symbols.scala b/src/compiler/scala/reflect/internal/Symbols.scala
index 2b04f479ed..ff3677c104 100644
--- a/src/compiler/scala/reflect/internal/Symbols.scala
+++ b/src/compiler/scala/reflect/internal/Symbols.scala
@@ -778,7 +778,6 @@ trait Symbols /* extends reflect.generic.Symbols*/ { self: SymbolTable =>
         }
         val current = phase
         try {
-          assertCorrectThread()
           phase = phaseOf(infos.validFrom)
           tp.complete(this)
         } finally {
@@ -829,13 +828,11 @@ trait Symbols /* extends reflect.generic.Symbols*/ { self: SymbolTable =>
       val curPid = phaseId(curPeriod)
 
       if (validTo != NoPeriod) {
-
         // skip any infos that concern later phases
         while (curPid < phaseId(infos.validFrom) && infos.prev != null)
           infos = infos.prev
 
         if (validTo < curPeriod) {
-          assertCorrectThread()
           // adapt any infos that come from previous runs
           val current = phase
           try {
diff --git a/src/compiler/scala/reflect/internal/Types.scala b/src/compiler/scala/reflect/internal/Types.scala
index cb658540a7..543209e819 100644
--- a/src/compiler/scala/reflect/internal/Types.scala
+++ b/src/compiler/scala/reflect/internal/Types.scala
@@ -107,7 +107,6 @@ trait Types /*extends reflect.generic.Types*/ { self: SymbolTable =>
 
     /** Undo all changes to constraints to type variables upto `limit`. */
     private def undoTo(limit: UndoLog) {
-      assertCorrectThread()
       while ((log ne limit) && log.nonEmpty) {
         val (tv, constr) = log.head
         tv.constr = constr
diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala
index d61edcc654..af5b9a9882 100644
--- a/src/compiler/scala/tools/nsc/interactive/Global.scala
+++ b/src/compiler/scala/tools/nsc/interactive/Global.scala
@@ -24,17 +24,13 @@ import symtab.Flags.{ACCESSOR, PARAMACCESSOR}
 
 /** The main class of the presentation compiler in an interactive environment such as an IDE
  */
-class Global(settings: Settings, reporter: Reporter, projectName: String = "")  extends {
-  /** Is the compiler initializing? Early def, so that the field is true during the
-   *  execution of the super constructor.
-   */
-  private var initializing = true
-} with scala.tools.nsc.Global(settings, reporter)
-  with CompilerControl
-  with RangePositions
-  with ContextTrees
-  with RichCompilationUnits
-  with Picklers {
+class Global(settings: Settings, reporter: Reporter, projectName: String = "")
+  extends scala.tools.nsc.Global(settings, reporter)
+     with CompilerControl
+     with RangePositions
+     with ContextTrees
+     with RichCompilationUnits
+     with Picklers {
 
   import definitions._
 
@@ -390,17 +386,7 @@ class Global(settings: Settings, reporter: Reporter, projectName: String = "")
   private var threadId = 0
 
   /** The current presentation compiler runner */
-  @volatile private[interactive] var compileRunner: Thread = newRunnerThread()
-
-  /** Check that the currenyly executing thread is the presentation compiler thread.
-   *
-   *  Compiler initialization may happen on a different thread (signalled by globalPhase being NoPhase)
-   */
-  override def assertCorrectThread() {
-    assert(initializing || (Thread.currentThread() eq compileRunner),
-        "Race condition detected: You are running a presentation compiler method outside the PC thread.[phase: %s]".format(globalPhase) +
-        " Please file a ticket with the current stack trace at https://www.assembla.com/spaces/scala-ide/support/tickets")
-  }
+  @volatile private[interactive] var compileRunner = newRunnerThread()
 
   /** Create a new presentation compiler runner.
    */
@@ -982,12 +968,6 @@ class Global(settings: Settings, reporter: Reporter, projectName: String = "")
         alt
     }
   }
-
-  /** The compiler has been initialized. Constructors are evaluated in textual order,
-   *  so this is set to true only after all super constructors and the primary constructor
-   *  have been executed.
-   */
-  initializing = false
 }
 
 object CancelException extends Exception