Merge remote-tracking branch 'origin/2.10.x' into merge-2.10.x

* origin/2.10.x:
  SI-6089 pt2: _ is tailpos in `_ || _` and `_ && _`
  Linked the PR policy in the README file.
  Scaladoc: Removing forgotten debugging info
  address "this would catch all throwables" warnings
  SI-1832 consistent symbols in casedef's pattern&body
  SIP-14 - Fix critical Java compatibility issue in scala.concurrent.Await
  Removes redundant outers
  Use `findMember` to lookup the static field in the host class.
  update docs for (partial) fun synth in uncurry
  SI-5999 a real fix to the packageless problem
  evicts calls to reify from our codebase
  an improvement based on Adriaan's comment
  SI-6031 customizable budget for patmat analyses
  SI-5739 address @retronym's feedback, more docs
  SI-5999 staticXXX is now friendly to packageless
  SI-5949 updates documentation of staticClass
  SI-5999 removes the macro context mirror
  more meaningful name for a missing hook method
  SI-5999 deploys a new starr
  SI-5999 removes Context.reify
  improves docs of scala.reflect.api.Mirrors
  SI-5984 improves error reporting in JavaMirrors
  SI-4897 derive expected value from single type
  Switch to 1.6 target for all javac invocations.
  Clean ups in impl.Future
  Critical bugfixes/leak fixes/API corrections + ScalaDoc for SIP-14
  Print the stack trace.
  Deprecate all JVM 1.5 targets and make 1.6 default.
  Shield from InterruptedException in partest.
  Scaladoc: Adressed @hubertp's comment on scala#925
  SI-5784 Scaladoc: Type templates
  Scaladoc: Groups
  Better debugging output in GenASM.
  Updated list of targets allowed in Ant's scalac.
  WIP add private/lazy checks and a few tests.
  Removes Float.Epsilon and Double.Epsilon
  SI-5939 resident compilation of sources in empty package
  Scaladoc: Typers change
  SI-6104 support This pattern
  Make  field strict and private.
  Implement @static annotation on singleton object fields.
  Fixed SI-6092. Fixed leaky annotations, and relaxed the conditions under which a try-catch is lifted out to an inner method.
  Fix SI-5937.
  SI-6089 better tail position analysis for matches
  SI-5695 removes Context.enclosingApplication
  SI-5892 allow implicit views in annotation args
  SI-5739 store sub-patterns in local vals
  changes error message generated by compiler
  SI-5856 enables use of $this in string interpolation
  SI-5895 fixes FieldMirrors
  SI-5784 Scaladoc: {Abstract,Alias} type templates
  test case closes SI-6047
  Fix for SI-5385.
  SI-6086 magic symbols strike back
  Scaladoc: Refactoring the entities
  SI-5533 Skip scaladoc packages from documentation
  Scaladoc: updated type class descriptions
  Scaladoc: Reducing the memory footprint 2
  Scaladoc: Reducing the memory footprint
  SI-3695 SI-4224 SI-4497 SI-5079 scaladoc links
  SI-4887 Link existentials in scaladoc
  Scaladoc minor fix: Typos in diagrams
  SI-4360 Adds prefixes to scaladoc
  Scaladoc: workaround for untypical Map usecases
  SI-4324 Scaladoc case class argument currying
  SI-5558 Package object members indexing
  SI-5965 Scaladoc crash
  Scaladoc: Inherited templates in diagrams
  SI-3314 SI-4888 Scaladoc: Relative type prefixes
  SI-5235 Correct usecase variable expansion
  Variation #10 to optimze findMember
  Attempt #9 to opimize findMember.
  Attempt #8 to opimize findMember.
  Attempty #7 to optimize findMember
  Fixing problem that caused fingerprints to fail in reflection. Also fixed test case that failed when moving to findMembers. Avoids similar problems in the future by renaming nme.ANYNAME
  Attemmpt #6 to optimize findMember
  Attempt #5 to optimize findMember.
  Attempt #4 to optimize findMember
  Attempt #3 to optimize findMember
  Attempt #2 to optimize findMember
  Attempt #1 to optimize findMember

Conflicts:
	test/files/run/existentials-in-compiler.scala

Author: paulp

README.rst

@@ -200,6 +200,8 @@ all code submitted to the project is unencumbered by copyrights or patents.
 The form is available at:
 http://www.scala-lang.org/sites/default/files/contributor_agreement.pdf
 
+Before submitting a pull-request, please make sure you have followed the guidelines
+outlined in our `Pull Request Policy <https://github.com/scala/scala/wiki/Pull-Request-Policy>`_.
 
 ------------------
 
@@ -208,5 +210,3 @@ http://www.scala-lang.org/sites/default/files/contributor_agreement.pdf
 Thank you!
 
 The Scala Team
-
-

build.xml

@@ -397,7 +397,7 @@ INITIALISATION
   </target>
 
   <target name="init" depends="init.jars, init.maven.jars, init.version.done, init.fail.bad.jdk, init.warn.jdk7">
-    <property name="scalac.args.always" value="" />
+    <property name="scalac.args.always" value="-Yreify-copypaste" />
   <!-- scalac.args.optimise is selectively overridden in certain antcall tasks. -->
     <property name="scalac.args.optimise" value=""/>
   <!-- scalac.args.quickonly are added to quick.* targets but not others (particularly, locker.)
@@ -499,7 +499,7 @@ LOCAL DEPENDENCY (Adapted ASM)
       destdir="${build-asm.dir}/classes"
       classpath="${build-asm.dir}/classes"
       includes="**/*.java"
-      target="1.5" source="1.5">
+      target="1.6" source="1.5">
         <compilerarg line="${javac.args} -XDignore.symbol.file"/>
     </javac>
     <touch file="${build-asm.dir}/asm.complete" verbose="no"/>
@@ -540,7 +540,7 @@ LOCAL DEPENDENCY (FORKJOIN)
       classpath="${build-libs.dir}/classes/forkjoin"
       includes="**/*.java"
       debug="true"
-      target="1.5" source="1.5">
+      target="1.6" source="1.5">
         <compilerarg line="${javac.args} -XDignore.symbol.file"/>
     </javac>
     <touch file="${build-libs.dir}/forkjoin.complete" verbose="no"/>
@@ -587,7 +587,7 @@ LOCAL DEPENDENCY (FJBG)
       classpath="${build-libs.dir}/classes/fjbg"
       includes="**/*.java"
       debug="true"
-      target="1.5" source="1.4">
+      target="1.6" source="1.4">
         <compilerarg line="${javac.args} -XDignore.symbol.file"/>
     </javac>
     <touch file="${build-libs.dir}/fjbg.complete" verbose="no"/>
@@ -635,7 +635,7 @@ LOCAL REFERENCE BUILD (LOCKER)
       srcdir="${src.dir}/library"
       destdir="${build-locker.dir}/classes/library"
       includes="**/*.java"
-      target="1.5" source="1.5">
+      target="1.6" source="1.5">
         <compilerarg line="${javac.args} -XDignore.symbol.file"/>
         <classpath>
           <path refid="forkjoin.classpath"/>
@@ -749,7 +749,7 @@ LOCAL REFERENCE BUILD (LOCKER)
           includes="**/*.java"
           excludes="**/tests/**"
           debug="true"
-          target="1.5" source="1.4">
+          target="1.6" source="1.4">
             <compilerarg line="${javac.args}"/>
         </javac>
         <scalacfork
@@ -1009,7 +1009,7 @@ QUICK BUILD (QUICK)
       srcdir="${src.dir}/library"
       destdir="${build-quick.dir}/classes/library"
       includes="**/*.java"
-      target="1.5" source="1.5">
+      target="1.6" source="1.5">
       <compilerarg line="${javac.args} -XDignore.symbol.file"/>
       <classpath>
         <path refid="forkjoin.classpath"/>
@@ -1020,7 +1020,7 @@ QUICK BUILD (QUICK)
       srcdir="${src.dir}/actors"
       destdir="${build-quick.dir}/classes/library"
       includes="**/*.java"
-      target="1.5" source="1.5">
+      target="1.6" source="1.5">
       <compilerarg line="${javac.args}"/>
       <classpath>
         <path refid="forkjoin.classpath"/>
@@ -1145,7 +1145,7 @@ QUICK BUILD (QUICK)
       includes="**/*.java"
       excludes="**/tests/**"
       debug="true"
-      target="1.5" source="1.4">
+      target="1.6" source="1.4">
         <compilerarg line="${javac.args}"/>
     </javac>
     <scalacfork
@@ -1349,7 +1349,7 @@ QUICK BUILD (QUICK)
     <javac
       srcdir="${src.dir}/partest"
       destdir="${build-quick.dir}/classes/partest"
-      target="1.5" source="1.5">
+      target="1.6" source="1.5">
       <classpath>
         <pathelement location="${build-quick.dir}/classes/library"/>
         <pathelement location="${build-quick.dir}/classes/reflect"/>
@@ -1691,7 +1691,7 @@ BOOTSTRAPPING BUILD (STRAP)
       srcdir="${src.dir}/library"
       destdir="${build-strap.dir}/classes/library"
       includes="**/*.java"
-      target="1.5" source="1.5">
+      target="1.6" source="1.5">
       <compilerarg line="${javac.args} -XDignore.symbol.file"/>
       <classpath>
         <path refid="forkjoin.classpath"/>
@@ -1702,7 +1702,7 @@ BOOTSTRAPPING BUILD (STRAP)
       srcdir="${src.dir}/actors"
       destdir="${build-strap.dir}/classes/library"
       includes="**/*.java"
-      target="1.5" source="1.5">
+      target="1.6" source="1.5">
       <compilerarg line="${javac.args}"/>
       <classpath>
         <path refid="forkjoin.classpath"/>
@@ -1826,7 +1826,7 @@ BOOTSTRAPPING BUILD (STRAP)
       includes="**/*.java"
       excludes="**/tests/**"
       debug="true"
-      target="1.5" source="1.4">
+      target="1.6" source="1.4">
         <compilerarg line="${javac.args}"/>
     </javac>
     <scalacfork
@@ -1994,7 +1994,7 @@ BOOTSTRAPPING BUILD (STRAP)
     <javac
       srcdir="${src.dir}/partest"
       destdir="${build-strap.dir}/classes/partest"
-      target="1.5" source="1.5">
+      target="1.6" source="1.5">
       <classpath>
         <pathelement location="${build-strap.dir}/classes/library"/>
         <pathelement location="${build-strap.dir}/classes/reflect"/>
@@ -2044,7 +2044,7 @@ BOOTSTRAPPING BUILD (STRAP)
 LIBRARIES (Forkjoin, FJBG, ASM)
 ============================================================================ -->
 
- 
+
   <target name="libs.clean" depends="pack.clean, asm.clean">
     <delete dir="${build-libs.dir}" includeemptydirs="yes" quiet="yes" failonerror="no"/>
   </target>
@@ -2082,8 +2082,9 @@ DOCUMENTATION
     <property name="scaladoc.url" value="https://github.com/scala/scala/tree/${scaladoc.git.commit}/src"/>
     <echo message="Scaladoc will point to ${scaladoc.url} for source files."/>
 
-    <!-- Unless set with -Dscaladoc.raw.output, it won't be activated -->
+    <!-- Unless set with -Dscaladoc.<...>, these won't be activated -->
     <property name="scaladoc.raw.output" value="no"/>
+    <property name="scaladoc.no.prefixes" value="no"/>
   </target>
 
   <target name="docs.pre-lib" depends="docs.start">
@@ -2111,7 +2112,11 @@ DOCUMENTATION
       classpathref="pack.classpath"
       addparams="${scalac.args.all}"
       docRootContent="${src.dir}/library/rootdoc.txt"
-      implicits="on" diagrams="on" rawOutput="${scaladoc.raw.output}">
+      implicits="on"
+      diagrams="on"
+      groups="on"
+      rawOutput="${scaladoc.raw.output}"
+      noPrefixes="${scaladoc.no.prefixes}">
       <src>
         <files includes="${src.dir}/actors-migration"/>
         <files includes="${src.dir}/actors"/>
@@ -2195,7 +2200,11 @@ DOCUMENTATION
       srcdir="${src.dir}/compiler"
       docRootContent="${src.dir}/compiler/rootdoc.txt"
       addparams="${scalac.args.all}"
-      implicits="on" diagrams="on" rawOutput="${scaladoc.raw.output}">
+      implicits="on"
+      diagrams="on"
+      groups="on"
+      rawOutput="${scaladoc.raw.output}"
+      noPrefixes="${scaladoc.no.prefixes}">
       <include name="**/*.scala"/>
     </scaladoc>
     <touch file="${build-docs.dir}/compiler.complete" verbose="no"/>
@@ -2217,7 +2226,11 @@ DOCUMENTATION
       classpathref="pack.classpath"
       srcdir="${src.dir}/jline/src/main/java"
       addparams="${scalac.args.all}"
-      implicits="on" diagrams="on" rawOutput="${scaladoc.raw.output}">
+      implicits="on"
+      diagrams="on"
+      groups="on"
+      rawOutput="${scaladoc.raw.output}"
+      noPrefixes="${scaladoc.no.prefixes}">
       <include name="**/*.scala"/>
       <include name="**/*.java"/>
     </scaladoc>
@@ -2241,7 +2254,11 @@ DOCUMENTATION
       classpathref="pack.classpath"
       srcdir="${src.dir}/scalap"
       addparams="${scalac.args.all}"
-      implicits="on" diagrams="on" rawOutput="${scaladoc.raw.output}">
+      implicits="on"
+      diagrams="on"
+      groups="on"
+      rawOutput="${scaladoc.raw.output}"
+      noPrefixes="${scaladoc.no.prefixes}">
       <include name="**/*.scala"/>
     </scaladoc>
     <touch file="${build-docs.dir}/scalap.complete" verbose="no"/>
@@ -2263,7 +2280,11 @@ DOCUMENTATION
       classpathref="pack.classpath"
       srcdir="${src.dir}/partest"
       addparams="${scalac.args.all}"
-      implicits="on" diagrams="on" rawOutput="${scaladoc.raw.output}">
+      implicits="on"
+      diagrams="on"
+      groups="on"
+      rawOutput="${scaladoc.raw.output}"
+      noPrefixes="${scaladoc.no.prefixes}">
       <include name="**/*.scala"/>
     </scaladoc>
     <touch file="${build-docs.dir}/partest.complete" verbose="no"/>
@@ -2285,7 +2306,11 @@ DOCUMENTATION
       classpathref="pack.classpath"
       srcdir="${src.dir}/continuations/plugin"
       addparams="${scalac.args.all}"
-      implicits="on" diagrams="on" rawOutput="${scaladoc.raw.output}">
+      implicits="on"
+      diagrams="on"
+      groups="on"
+      rawOutput="${scaladoc.raw.output}"
+      noPrefixes="${scaladoc.no.prefixes}">
       <include name="**/*.scala"/>
     </scaladoc>
     <touch file="${build-docs.dir}/continuations-plugin.complete" verbose="no"/>
@@ -2307,7 +2332,11 @@ DOCUMENTATION
       classpathref="pack.classpath"
       srcdir="${src.dir}/actors-migration"
       addparams="${scalac.args.all}"
-      implicits="on" diagrams="on" rawOutput="${scaladoc.raw.output}">
+      implicits="on"
+      diagrams="on"
+      groups="on"
+      rawOutput="${scaladoc.raw.output}"
+      noPrefixes="${scaladoc.no.prefixes}">
       <include name="**/*.scala"/>
     </scaladoc>
     <touch file="${build-docs.dir}/actors-migration.complete" verbose="no"/>

lib/scala-compiler-src.jar.desired.sha1

@@ -1 +1 @@
-259fd9f0a50ed6003248a01a366a97a5549aa386 ?scala-compiler-src.jar
+6a03de33fb670e1b1a9930234adb6d1d6435323d ?scala-compiler-src.jar

lib/scala-compiler.jar.desired.sha1

@@ -1 +1 @@
-42f7367cc6ac59022d098e6091e5425390b9c925 ?scala-compiler.jar
+cf6aab754bcf77ab433e2b05d1f452e13f24cedc ?scala-compiler.jar

lib/scala-library-src.jar.desired.sha1

@@ -1 +1 @@
-e31e38414fd19c10add3e65bf77c2fd7c6c26f7d ?scala-library-src.jar
+02dcd8656f99eabbad8d9dce06a33d4f6f8d7c38 ?scala-library-src.jar

lib/scala-library.jar.desired.sha1

@@ -1 +1 @@
-2418c95bf7db34f87ebda4a5eaa918fe85047afb ?scala-library.jar
+6a035e798a94c6ca051e6a7663293cfee3d7136f ?scala-library.jar

lib/scala-reflect-src.jar.desired.sha1

@@ -1 +1 @@
-51c64d77ad4c4233a06cea7ea80b0fb77e9867c4 ?scala-reflect-src.jar
+ecb9dd737935812a6399a3426e9126908ef870b2 ?scala-reflect-src.jar

lib/scala-reflect.jar.desired.sha1

@@ -1 +1 @@
-5656bf2f17bb9f22b3ba61a83393a9794eaa5429 ?scala-reflect.jar
+344f3feafa4bd155b13ba7a6ab3efd605f8f8388 ?scala-reflect.jar

src/compiler/scala/reflect/makro/runtime/Context.scala

@@ -8,7 +8,6 @@ abstract class Context extends scala.reflect.makro.Context
                          with CapturedVariables
                          with Infrastructure
                          with Enclosures
-                         with Mirrors
                          with Names
                          with Reifiers
                          with FrontEnds
@@ -23,7 +22,7 @@ abstract class Context extends scala.reflect.makro.Context
 
   val universe: Global
 
-  val mirror: MirrorOf[universe.type] = new ContextMirror
+  val mirror: MirrorOf[universe.type] = universe.rootMirror
 
   val callsiteTyper: universe.analyzer.Typer
 

src/compiler/scala/reflect/makro/runtime/ContextReifiers.scala

@@ -14,7 +14,6 @@ trait Enclosures {
   // vals are eager to simplify debugging
   // after all we wouldn't save that much time by making them lazy
   val macroApplication: Tree                 = expandee
-  val enclosingApplication: Tree             = enclTrees collectFirst { case t: Apply => t } getOrElse EmptyTree
   val enclosingClass: Tree                   = site.enclClass.tree
   val enclosingImplicits: List[(Type, Tree)] = site.openImplicits
   val enclosingMacros: List[Context]         = this :: universe.analyzer.openMacros // include self