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

* origin/2.10.x: (68 commits)
  Eliminate breaking relative names in source.
  "Hot fix" for broken build.
  Fix SI-4813 - Clone doesn't work on LinkedList.
  Made 'def clone()' consistent with parens everywhere.
  accommodates pull request feedback
  SI-6310 redeploys the starr
  SI-6310 AbsTypeTag => WeakTypeTag
  SI-6323 outlaws free types from TypeTag
  SI-6323 prohibits reflection against free types
  improvements for reification of free symbols
  removes build.newFreeExistential
  SI-6359 Deep prohibition of templates in value class
  Fixes SI-6259.  Unable to use typeOf in super call of top-level object.
  Fixes binary repo push for new typesafe repo layouts.
  Better error message for pattern arity errors.
  Rescued TreeBuilder from the parser.
  Pending test for SI-3943
  Test case for a bug fixed in M7.
  Fix for SI-6367, exponential time in inference.
  SI-6306 Remove incorrect eta-expansion optimization in Uncurry
  ...

Conflicts:
	src/compiler/scala/tools/nsc/transform/AddInterfaces.scala
	src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala

1 files changed, 2 insertions, 2 deletions

diff --git a/test/files/run/macro-expand-implicit-argument/Macros_1.scala b/test/files/run/macro-expand-implicit-argument/Macros_1.scala
index 7629c5a9e2..86c4198870 100644
--- a/test/files/run/macro-expand-implicit-argument/Macros_1.scala
+++ b/test/files/run/macro-expand-implicit-argument/Macros_1.scala
@@ -35,7 +35,7 @@ object Macros {
    *     arr
    *   }
    */
-  def arrayMacro[A:c.AbsTypeTag](c:Context)(as:c.Expr[A]*)(ct: c.Expr[ClassTag[A]]): c.Expr[Array[A]] = {
+  def arrayMacro[A:c.WeakTypeTag](c:Context)(as:c.Expr[A]*)(ct: c.Expr[ClassTag[A]]): c.Expr[Array[A]] = {
     import c.mirror._
     import c.universe._
     def const(x:Int) = Literal(Constant(x))
@@ -44,7 +44,7 @@ object Macros {
     val arr = newTermName("arr")
 
     val create = Apply(Select(ct.tree, "newArray"), List(const(n)))
-    val arrtpe = TypeTree(implicitly[c.AbsTypeTag[Array[A]]].tpe)
+    val arrtpe = TypeTree(implicitly[c.WeakTypeTag[Array[A]]].tpe)
     val valdef = ValDef(Modifiers(), arr, arrtpe, create)
 
     val updates = (0 until n).map {