Merged revisions 24551-24564,24567 via svnmerge...

Merged revisions 24551-24564,24567 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk

........
  r24551 | odersky | 2011-03-23 16:31:04 +0100 (Wed, 23 Mar 2011) | 2 lines

  Squashing the signature bugs. The trick is that mixed in methods are
declared as bridges. Review by extempore. ........ r24552 | odersky |
2011-03-23 16:33:58 +0100 (Wed, 23 Mar 2011) | 1 line

  Simple test case to see whether Java understands mixed in signatures.
This should be extended with more cases. Review by extempore. ........
r24553 | odersky | 2011-03-23 19:32:39 +0100 (Wed, 23 Mar 2011) | 1 line

  Moving signature tests to pending, because they operate under wrong
assumptions now that mixed in members are bridges. Review by extempore.
........ r24554 | odersky | 2011-03-23 22:44:13 +0100 (Wed, 23 Mar 2011)
| 1 line

  Fixes scala#4298. Review by extempore.
........
  r24555 | extempore | 2011-03-23 23:35:09 +0100 (Wed, 23 Mar 2011) | 2 lines

  Spiced up the signature test infrastructure a bunch, wrote some more
tests, restored the tests in pending. No review. ........ r24556 |
extempore | 2011-03-24 02:10:26 +0100 (Thu, 24 Mar 2011) | 2 lines

  Restoring my higher-kinded-Array signature check which martin
callously blew away while fixing all our other problems. Review by
odersky. ........ r24557 | extempore | 2011-03-24 03:35:22 +0100 (Thu,
24 Mar 2011) | 1 line

  Looks like I accidentally committed a test log, no review. ........
r24558 | extempore | 2011-03-24 06:49:53 +0100 (Thu, 24 Mar 2011) | 2
lines

  Discovered Range.foreach inlining was broken due to a Nothing
signature appearing and confusing the loader. No review. ........ r24559
| extempore | 2011-03-24 08:04:32 +0100 (Thu, 24 Mar 2011) | 3 lines

  Removing empty directories the newly informative partest told me
about. No review. ........ r24560 | extempore | 2011-03-24 09:46:55
+0100 (Thu, 24 Mar 2011) | 2 lines

  Changed App-using tests to use main() to see if that's our trouble. No
review. ........ r24561 | odersky | 2011-03-24 12:15:37 +0100 (Thu, 24
Mar 2011) | 1 line

  Moved failing tests to pending after having diagnosed that the only
problem is a difference in output between Java 1.5 and 1.6 reflection
libraries. Can we moved back once that's fixed. For now, it's more
important to ghet the build back. ........ r24562 | phaller | 2011-03-24
15:09:18 +0100 (Thu, 24 Mar 2011) | 1 line

  Deprecated unused members in scala.concurrent. Added documentation to
scala.concurrent.ops and scala.concurrent.FutureTaskRunner. ........
r24563 | phaller | 2011-03-24 15:19:35 +0100 (Thu, 24 Mar 2011) | 1 line

  Added implicit TaskRunner parameters to scala.concurrent.ops.{par, replicate}. Review by prokopec.
........
  r24564 | prokopec | 2011-03-24 16:00:41 +0100 (Thu, 24 Mar 2011) | 5 lines

  Added a temporary fix for scala#4351, but disabled it because the extend
specialized class with nonspecialized type-parameters is used in the
stdlib already.

  Disabling scala.parallel package, adding the currently disabled
scala.concurrent package which will be implemented in some of the next
releases.

  Review by phaller.
........
  r24567 | odersky | 2011-03-24 17:32:15 +0100 (Thu, 24 Mar 2011) | 1 line

  Three things to make Eclipse more robust against deadlocks: (1)
catch stale responses in presentation compile thread. (2) Avoid stale
responses by two try-finallys in getEnteredParsed, askLoadedTyped.
........

Author: Antonio Cunei

src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala

@@ -549,7 +549,7 @@ abstract class GenJVM extends SubComponent with GenJVMUtil with GenAndroid {
 
     // @M don't generate java generics sigs for (members of) implementation
     // classes, as they are monomorphic (TODO: ok?)
-    private def noGenericSignature(sym: Symbol) = (
+    private def needsGenericSignature(sym: Symbol) = !(
       // PP: This condition used to include sym.hasExpandedName, but this leads
       // to the total loss of generic information if a private member is
       // accessed from a closure: both the field and the accessor were generated
@@ -558,11 +558,11 @@ abstract class GenJVM extends SubComponent with GenJVMUtil with GenAndroid {
       // unrelated change.
          sym.isSynthetic
       || sym.isLiftedMethod
+      || sym.isBridge
       || (sym.ownerChain exists (_.isImplClass))
     )
     def addGenericSignature(jmember: JMember, sym: Symbol, owner: Symbol) {
-      if (noGenericSignature(sym)) ()
-      else {
+      if (needsGenericSignature(sym)) {
         val memberTpe = atPhase(currentRun.erasurePhase)(owner.thisType.memberInfo(sym))
         // println("addGenericSignature sym: " + sym.fullName + " : " + memberTpe + " sym.info: " + sym.info)
         // println("addGenericSignature: "+ (sym.ownerChain map (x => (x.name, x.isImplClass))))
@@ -572,34 +572,37 @@ abstract class GenJVM extends SubComponent with GenJVMUtil with GenAndroid {
            *  in which case we treat every signature as valid.  Medium term we
            *  should certainly write independent signature validation.
            */
-          if (SigParser.isParserAvailable && isValidSignature(sym, sig)) {
+          if (SigParser.isParserAvailable && !isValidSignature(sym, sig)) {
+            clasz.cunit.warning(sym.pos,
+                """|compiler bug: created invalid generic signature for %s in %s
+                   |signature: %s
+                   |if this is reproducible, please report bug at http://lampsvn.epfl.ch/trac/scala
+                """.trim.stripMargin.format(sym, sym.owner.skipPackageObject.fullName, sig))
+            return
+          }
+          if ((settings.check.value contains "genjvm")) {
             val normalizedTpe = atPhase(currentRun.erasurePhase)(erasure.prepareSigMap(memberTpe))
             val bytecodeTpe = owner.thisType.memberInfo(sym)
-            if (sym.isType || (erasure.erasure(normalizedTpe) =:= bytecodeTpe)) {
-              val index = jmember.getConstantPool.addUtf8(sig).toShort
-              if (opt.verboseDebug)
-                atPhase(currentRun.erasurePhase) {
-                  println("add generic sig "+sym+":"+sym.info+" ==> "+sig+" @ "+index)
-                }
-              val buf = ByteBuffer.allocate(2)
-              buf putShort index
-              addAttribute(jmember, tpnme.SignatureATTR, buf)
-            } else {
-              if (sym.hasFlag(Flags.MIXEDIN))
-                ()// println("suppressing signature for mixedin "+sym)
-              else
-                clasz.cunit.warning(sym.pos,
-              """|compiler bug: created generic signature for %s in %s that does not conform to its erasure
-                 |signature: %s
-                 |erasure type: %s
-                 |if this is reproducible, please report bug at http://lampsvn.epfl.ch/trac/scala
-              """.trim.stripMargin.format(sym, sym.owner.skipPackageObject.fullName, sig, bytecodeTpe))
+            if (!sym.isType && !sym.isConstructor && !(erasure.erasure(normalizedTpe) =:= bytecodeTpe)) {
+              clasz.cunit.warning(sym.pos,
+                  """|compiler bug: created generic signature for %s in %s that does not conform to its erasure
+                     |signature: %s
+                     |original type: %s
+                     |normalized type: %s
+                     |erasure type: %s
+                     |if this is reproducible, please report bug at http://lampsvn.epfl.ch/trac/scala
+                  """.trim.stripMargin.format(sym, sym.owner.skipPackageObject.fullName, sig, memberTpe, normalizedTpe, bytecodeTpe))
+               return
+            }
+          }
+          val index = jmember.getConstantPool.addUtf8(sig).toShort
+          if (opt.verboseDebug)
+            atPhase(currentRun.erasurePhase) {
+              println("add generic sig "+sym+":"+sym.info+" ==> "+sig+" @ "+index)
             }
-          } else clasz.cunit.warning(sym.pos,
-            """|compiler bug: created invalid generic signature for %s in %s
-               |signature: %s
-               |if this is reproducible, please report bug at http://lampsvn.epfl.ch/trac/scala
-            """.trim.stripMargin.format(sym, sym.owner.skipPackageObject.fullName, sig))
+          val buf = ByteBuffer.allocate(2)
+          buf putShort index
+          addAttribute(jmember, tpnme.SignatureATTR, buf)
         }
       }
     }
@@ -1858,7 +1861,7 @@ abstract class GenJVM extends SubComponent with GenJVMUtil with GenAndroid {
       if (sym.isInterface) ACC_INTERFACE else 0,
       if (sym.isFinal && !sym.enclClass.isInterface && !sym.isClassConstructor) ACC_FINAL else 0,
       if (sym.isStaticMember) ACC_STATIC else 0,
-      if (sym.isBridge) ACC_BRIDGE else 0,
+      if (sym.isBridge || sym.hasFlag(Flags.MIXEDIN) && sym.isMethod) ACC_BRIDGE else 0,
       if (sym.isClass && !sym.isInterface) ACC_SUPER else 0,
       if (sym.isVarargsMethod) ACC_VARARGS else 0
     )

src/compiler/scala/tools/nsc/interactive/CompilerControl.scala

@@ -103,6 +103,10 @@ trait CompilerControl { self: Global =>
     throw new FatalError("no context found for "+pos)
   }
 
+  private def postWorkItem(item: WorkItem) {
+    scheduler.postWorkItem(item)
+  }
+
   /** Makes sure a set of compilation units is loaded and parsed.
    *  Returns () to syncvar `response` on completions.
    *  Afterwards a new background compiler run is started with
@@ -113,15 +117,15 @@ trait CompilerControl { self: Global =>
       case ri: ReloadItem if ri.sources == sources => Some(ri)
       case _ => None
     }
-    superseeded foreach (_.response.set())
-    scheduler postWorkItem new ReloadItem(sources, response)
+    superseeded.foreach(_.response.set())
+    postWorkItem(new ReloadItem(sources, response))
   }
 
   /** Sets sync var `response` to the smallest fully attributed tree that encloses position `pos`.
    *  Note: Unlike for most other ask... operations, the source file belonging to `pos` needs not be be loaded.
    */
   def askTypeAt(pos: Position, response: Response[Tree]) =
-    scheduler postWorkItem new AskTypeAtItem(pos, response)
+    postWorkItem(new AskTypeAtItem(pos, response))
 
   /** Sets sync var `response` to the fully attributed & typechecked tree contained in `source`.
    *  @pre `source` needs to be loaded.
@@ -131,7 +135,7 @@ trait CompilerControl { self: Global =>
       println("ask type called")
       new Exception().printStackTrace()
     }
-    scheduler postWorkItem new AskTypeItem(source, forceReload, response)
+    postWorkItem(new AskTypeItem(source, forceReload, response))
   }
 
   /** Sets sync var `response` to the position of the definition of the given link in
@@ -146,25 +150,25 @@ trait CompilerControl { self: Global =>
    *  is unloaded, it stays that way.
    */
   def askLinkPos(sym: Symbol, source: SourceFile, response: Response[Position]) =
-    scheduler postWorkItem new AskLinkPosItem(sym, source, response)
+    postWorkItem(new AskLinkPosItem(sym, source, response))
 
   /** Sets sync var `response' to list of members that are visible
    *  as members of the tree enclosing `pos`, possibly reachable by an implicit.
    *  @pre  source is loaded
    */
   def askTypeCompletion(pos: Position, response: Response[List[Member]]) =
-    scheduler postWorkItem new AskTypeCompletionItem(pos, response)
+    postWorkItem(new AskTypeCompletionItem(pos, response))
 
   /** Sets sync var `response' to list of members that are visible
    *  as members of the scope enclosing `pos`.
    *  @pre  source is loaded
    */
   def askScopeCompletion(pos: Position, response: Response[List[Member]]) =
-    scheduler postWorkItem new AskScopeCompletionItem(pos, response)
+    postWorkItem(new AskScopeCompletionItem(pos, response))
 
   /** Asks to do unit corresponding to given source file on present and subsequent type checking passes */
   def askToDoFirst(source: SourceFile) =
-    scheduler postWorkItem new AskToDoFirstItem(source)
+    postWorkItem(new AskToDoFirstItem(source))
 
   /** If source is not yet loaded, loads it, and starts a new run, otherwise
    *  continues with current pass.
@@ -175,7 +179,7 @@ trait CompilerControl { self: Global =>
    *                   the a NoSuchUnitError is raised in the response.
    */
   def askLoadedTyped(source: SourceFile, response: Response[Tree]) =
-    scheduler postWorkItem new AskLoadedTypedItem(source, response)
+    postWorkItem(new AskLoadedTypedItem(source, response))
 
   /** If source if not yet loaded, get an outline view with askParseEntered.
    *  If source is loaded, wait for it to be typechecked.
@@ -196,7 +200,7 @@ trait CompilerControl { self: Global =>
    *  @param response     The response.
    */
   def askParsedEntered(source: SourceFile, keepLoaded: Boolean, response: Response[Tree]) =
-    scheduler postWorkItem new AskParsedEnteredItem(source, keepLoaded, response)
+    postWorkItem(new AskParsedEnteredItem(source, keepLoaded, response))
 
   /** Cancels current compiler run and start a fresh one where everything will be re-typechecked
    *  (but not re-loaded).
@@ -314,3 +318,5 @@ object ShutdownReq extends ControlThrowable
 
 class NoSuchUnitError(file: AbstractFile) extends Exception("no unit found for file "+file)
 
+class MissingResponse extends Exception("response missing")
+

src/compiler/scala/tools/nsc/interactive/Global.scala

@@ -120,6 +120,22 @@ class Global(settings: Settings, reporter: Reporter)
     }
   }
 
+  private def cleanAllResponses() {
+    cleanResponses(waitLoadedTypeResponses)
+    cleanResponses(getParsedEnteredResponses)
+  }
+
+  private def checkNoOutstanding(rmap: ResponseMap): Unit =
+    for ((_, rs) <- rmap.toList; r <- rs) {
+      debugLog("ERROR: missing response, request will be discarded")
+      r raise new MissingResponse
+    }
+
+  def checkNoResponsesOutstanding() {
+    checkNoOutstanding(waitLoadedTypeResponses)
+    checkNoOutstanding(getParsedEnteredResponses)
+  }
+
   /** The compilation unit corresponding to a source file
    *  if it does not yet exist create a new one atomically
    *  Note: We want to remove this.
@@ -417,8 +433,7 @@ class Global(settings: Settings, reporter: Reporter)
     }
 
     // clean out stale waiting responses
-    cleanResponses(waitLoadedTypeResponses)
-    cleanResponses(getParsedEnteredResponses)
+    cleanAllResponses()
 
     // wind down
     if (waitLoadedTypeResponses.nonEmpty || getParsedEnteredResponses.nonEmpty) {
@@ -841,8 +856,8 @@ class Global(settings: Settings, reporter: Reporter)
         else { debugLog("wait for later"); outOfDate = true; waitLoadedTypeResponses(source) += response }
       case None =>
         debugLog("load unit and type")
-        reloadSources(List(source))
-        waitLoadedTyped(source, response)
+        try reloadSources(List(source))
+        finally waitLoadedTyped(source, response)
     }
   }
 
@@ -852,14 +867,13 @@ class Global(settings: Settings, reporter: Reporter)
       case Some(unit) =>
         getParsedEnteredNow(source, response)
       case None =>
-        if (keepLoaded) {
-          reloadSources(List(source))
-          getParsedEnteredNow(source, response)
-        } else if (outOfDate) {
+        if (keepLoaded)
+          try reloadSources(List(source))
+          finally getParsedEnteredNow(source, response)
+        else if (outOfDate)
           getParsedEnteredResponses(source) += response
-        } else {
+        else
           getParsedEnteredNow(source, response)
-        }
     }
   }
 

src/compiler/scala/tools/nsc/interactive/PresentationCompilerThread.scala

@@ -20,6 +20,7 @@ class PresentationCompilerThread(var compiler: Global, threadId: Int) extends Th
     compiler.debugLog("starting new runner thread")
     try {
       while (true) {
+        compiler.checkNoResponsesOutstanding()
         compiler.log.logreplay("wait for more work", { compiler.scheduler.waitForMoreWork(); true })
         compiler.pollForWork(compiler.NoPosition)
         while (compiler.isOutOfDate) {

src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala

@@ -264,7 +264,7 @@ abstract class ClassfileParser {
 //            println("Looking for: " + name + ": " + tpe + " inside: " + ownerTpe.typeSymbol + "\n\tand found: " + ownerTpe.members)
           }
         }
-        assert(f != NoSymbol, "could not find " + name + ": " + tpe + "inside: \n" + ownerTpe.members)
+        assert(f != NoSymbol, "could not find\n  " + name + ": " + tpe + "\ninside:\n  " + ownerTpe.members.mkString(", "))
         values(index) = f
       }
       f