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

* origin/2.10.x:
  first stab at serialization of exprs and tags
  deploys a new starr that knows reify is a macro
  moves Expr from api to base
  evicts last traces of makro from our codebase
  reflect.makro => reflect.macros (Step I)
  removes -Xmacro-(.*)-classpath compiler options
  prepares our macro defs for refactoring (Step II)
  prepares our macro defs for refactoring (Step I)
  more refinements of reflection API
  SI-5888 Mirrors now have sane toStrings
  renames asType to toType and asXXXSymbol to asXXX
  miscellaneous refinements of reflection API
  navigation between fields and accessors
  moves most of symbol tests in API to descendants
  simplifies flag API
  SI-5732 members and derivatives now return Scope
  SI-5751 cleans up toolboxes for the release
  I actually managed to hit the limit of Scala signature annotation not fitting into a single string (high five everyone) and entered the undisovered region of arrEncode in GenASM. arrEncode returns Array[String] so asm.AnnotationWriter is not going to like it.
  Added more variants to achieve getLinkPos
  Checkfile update.
  Fixed maddening "..." lately in printed types.
  Removed resolveOverloaded
  SI-5866 Support casting null to value classes
  ClassTag.Nothing now throws an exception
  Fixed SI-5031. Only consider classes when looking for companion class. sym.effectiveOwner revealed this piece of inconsistency. companionModule is fine because similar check is there already.
  Fixed SI-5603. Early definitions now get transparent positions. This includes a fix for a minor problem described in #594 - ensureNonOverlapping still focuses on default position when outside of early defs. Review by @dragos, @odersky.
  SI-5799 Secondary constructors in value classes not allowed
  Closes SI-5878
  Closes SI-5882
  Closed 6029 ...
  New Worksheet mixing scheme
  Raw string interpolator
  Adds method askForResponse
  Disable interrupts during code instrumentation
  New Executor.
  SI-6142: warn @inline-methods ending up not inlined (rightfully or not)
  Avoids loading scala.package and scala.reflect.package from source if a classfile exists.
  `ScriptSourceFile` should not hard-code `OffsetPosition`.
  Fix `Instrumentation.getStatistics` method in partest.
  Instrument all classes in `instrumented` package.
  SI-5958 This deserves a stable type
  SI-6140 Scaladoc infinite recursion in wiki parser
  SI-4560 - improved test
  Revert "tentative fix for RC5 lift build problem."
  Revert "Closes #4560. Review by dragos." (introduction of safeREF)
  Revert fix part of "Closes 4560. Review by dragos."
  Fix SI-4560, NoSuchMethodErrors involving self types.
  SI-2038 make pt fully-defined when typing Typed

Conflicts:
	src/compiler/scala/tools/nsc/interpreter/Imports.scala
	src/compiler/scala/tools/nsc/interpreter/JLineCompletion.scala
	src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala

1 files changed, 10 insertions, 10 deletions

diff --git a/test/files/run/t6028.check b/test/files/run/t6028.check
index 9dffcbadd4..c10bd76500 100644
--- a/test/files/run/t6028.check
+++ b/test/files/run/t6028.check
@@ -15,16 +15,16 @@ package <empty> {
       }
     };
     def bar(barParam: Int): Object = {
-      @volatile var MethodLocalObject$module: scala.runtime.VolatileObjectRef = new scala.runtime.VolatileObjectRef(<empty>);
+      @volatile var MethodLocalObject$module: runtime.VolatileObjectRef = new runtime.VolatileObjectRef(<empty>);
       T.this.MethodLocalObject$1(barParam, MethodLocalObject$module)
     };
     def tryy(tryyParam: Int): Function0 = {
-      var tryyLocal: scala.runtime.IntRef = new scala.runtime.IntRef(0);
+      var tryyLocal: runtime.IntRef = new runtime.IntRef(0);
       {
         (new anonymous class $anonfun$tryy$1(T.this, tryyParam, tryyLocal): Function0)
       }
     };
-    @SerialVersionUID(0) final <synthetic> class $anonfun$foo$1 extends scala.runtime.AbstractFunction0$mcI$sp with Serializable {
+    @SerialVersionUID(0) final <synthetic> class $anonfun$foo$1 extends runtime.AbstractFunction0$mcI$sp with Serializable {
       def <init>($outer: T, methodParam$1: Int, methodLocal$1: Int): anonymous class $anonfun$foo$1 = {
         $anonfun$foo$1.super.<init>();
         ()
@@ -41,7 +41,7 @@ package <empty> {
       <synthetic> <stable> <hidden> def T$MethodLocalTrait$$$outer(): T
     };
     object MethodLocalObject$2 extends Object with T#MethodLocalTrait$1 {
-      def <init>($outer: T, barParam$1: Int): ... = {
+      def <init>($outer: T, barParam$1: Int): T#MethodLocalObject$2.type = {
         MethodLocalObject$2.super.<init>();
         MethodLocalObject$2.this.$asInstanceOf[T#MethodLocalTrait$1$class]()./*MethodLocalTrait$1$class*/$init$(barParam$1);
         ()
@@ -50,9 +50,9 @@ package <empty> {
       <synthetic> <stable> <hidden> def T$MethodLocalObject$$$outer(): T = MethodLocalObject$2.this.$outer;
       <synthetic> <stable> <hidden> def T$MethodLocalTrait$$$outer(): T = MethodLocalObject$2.this.$outer
     };
-    final <stable> private[this] def MethodLocalObject$1(barParam$1: Int, MethodLocalObject$module$1: scala.runtime.VolatileObjectRef): ... = {
-      MethodLocalObject$module$1.elem = new ...(T.this, barParam$1);
-      MethodLocalObject$module$1.elem.$asInstanceOf[...]()
+    final <stable> private[this] def MethodLocalObject$1(barParam$1: Int, MethodLocalObject$module$1: runtime.VolatileObjectRef): T#MethodLocalObject$2.type = {
+      MethodLocalObject$module$1.elem = new T#MethodLocalObject$2.type(T.this, barParam$1);
+      MethodLocalObject$module$1.elem.$asInstanceOf[T#MethodLocalObject$2.type]()
     };
     abstract trait MethodLocalTrait$1$class extends Object with T#MethodLocalTrait$1 {
       def /*MethodLocalTrait$1$class*/$init$(barParam$1: Int): Unit = {
@@ -60,8 +60,8 @@ package <empty> {
       };
       scala.this.Predef.print(scala.Int.box(barParam$1))
     };
-    @SerialVersionUID(0) final <synthetic> class $anonfun$tryy$1 extends scala.runtime.AbstractFunction0$mcV$sp with Serializable {
-      def <init>($outer: T, tryyParam$1: Int, tryyLocal$1: scala.runtime.IntRef): anonymous class $anonfun$tryy$1 = {
+    @SerialVersionUID(0) final <synthetic> class $anonfun$tryy$1 extends runtime.AbstractFunction0$mcV$sp with Serializable {
+      def <init>($outer: T, tryyParam$1: Int, tryyLocal$1: runtime.IntRef): anonymous class $anonfun$tryy$1 = {
         $anonfun$tryy$1.super.<init>();
         ()
       };
@@ -76,7 +76,7 @@ package <empty> {
         scala.runtime.BoxedUnit.UNIT
       };
       <synthetic> <paramaccessor> private[this] val tryyParam$1: Int = _;
-      <synthetic> <paramaccessor> private[this] val tryyLocal$1: scala.runtime.IntRef = _
+      <synthetic> <paramaccessor> private[this] val tryyLocal$1: runtime.IntRef = _
     }
   }
 }