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, 3 insertions, 3 deletions

diff --git a/src/compiler/scala/tools/nsc/typechecker/Tags.scala b/src/compiler/scala/tools/nsc/typechecker/Tags.scala
index d4e4100dfa..44fa9a5d7a 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Tags.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Tags.scala
@@ -26,7 +26,7 @@ trait Tags {
     /** Finds in scope or materializes a ClassTag.
      *  Should be used instead of ClassManifest every time compiler needs to persist an erasure.
      *
-     *  Once upon a time, we had an `ErasureTag` which was to `ClassTag` the same that `AbsTypeTag` is for `TypeTag`.
+     *  Once upon a time, we had an `ErasureTag` which was to `ClassTag` the same that `WeakTypeTag` is for `TypeTag`.
      *  However we found out that we don't really need this concept, so it got removed.
      *
      *  @param   pos                    Position for error reporting. Please, provide meaningful value.
@@ -43,7 +43,7 @@ trait Tags {
       resolveTag(pos, taggedTp, allowMaterialization)
     }
 
-    /** Finds in scope or materializes an AbsTypeTag (if `concrete` is false) or a TypeTag (if `concrete` is true).
+    /** Finds in scope or materializes an WeakTypeTag (if `concrete` is false) or a TypeTag (if `concrete` is true).
      *
      *  @param   pos                    Position for error reporting. Please, provide meaningful value.
      *  @param   pre                    Prefix that represents a universe this type tag will be bound to.
@@ -60,7 +60,7 @@ trait Tags {
      *           EmptyTree if `allowMaterialization` is false, and there is no array tag in scope.
      */
     def resolveTypeTag(pos: Position, pre: Type, tp: Type, concrete: Boolean, allowMaterialization: Boolean = true): Tree = {
-      val tagSym = if (concrete) TypeTagClass else AbsTypeTagClass
+      val tagSym = if (concrete) TypeTagClass else WeakTypeTagClass
       val tagTp =  if (pre == NoType) TypeRef(BaseUniverseClass.toTypeConstructor, tagSym, List(tp)) else singleType(pre, pre member tagSym.name)
       val taggedTp = appliedType(tagTp, List(tp))
       resolveTag(pos, taggedTp, allowMaterialization)