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

* origin/2.10.x:
  if starr.use.released fetch Scala ${starr.version} for STARR
  assume build.release when maven.version.suffix is set
  make quick.done depend on quick.bin again
  SI-7321 Memory leak in specialize on multiple compiler runs.
  Take the N^2 out of the compiler's TreeSet.
  SI-6900 Fix tailrec for dependent method types
  Simplify interplay between Uncurry Info- and Tree-Transformers
  Refactor existential related code out of types.
  Add a cautionary comment to TreeSymSubstitutor.
  SI-6715 Shouldn't return "" from TermNames.originalName
  Backport #2289's TermNames.unexpandedName as TermNames.originalName
  SI-7147 Diagnostic for unexplained assertion in presentation compiler.
  SI-6793 Don't use super param accessors if inaccessible.
  Correct sorting example for Ordering in scaladoc

Conflicts:
	bincompat-backward.whitelist.conf
	bincompat-forward.whitelist.conf
	build.xml
	src/compiler/scala/tools/nsc/transform/UnCurry.scala
	src/reflect/scala/reflect/internal/StdNames.scala

1 files changed, 12 insertions, 2 deletions

diff --git a/src/compiler/scala/tools/nsc/transform/TailCalls.scala b/src/compiler/scala/tools/nsc/transform/TailCalls.scala
index 92ed7fc555..313f968e93 100644
--- a/src/compiler/scala/tools/nsc/transform/TailCalls.scala
+++ b/src/compiler/scala/tools/nsc/transform/TailCalls.scala
@@ -217,7 +217,10 @@ abstract class TailCalls extends Transform {
           debuglog("Rewriting tail recursive call:  " + fun.pos.lineContent.trim)
 
           accessed += ctx.label
-          typedPos(fun.pos)(Apply(Ident(ctx.label), noTailTransform(recv) :: transformArgs))
+          typedPos(fun.pos) {
+            val args = mapWithIndex(transformArgs)((arg, i) => mkAttributedCastHack(arg, ctx.label.info.params(i + 1).tpe))
+            Apply(Ident(ctx.label), noTailTransform(recv) :: args)
+          }
         }
 
         if (!ctx.isEligible)            fail("it is neither private nor final so can be overridden")
@@ -276,7 +279,7 @@ abstract class TailCalls extends Transform {
 
               typedPos(tree.pos)(Block(
                 List(ValDef(newThis, This(currentClass))),
-                LabelDef(newCtx.label, newThis :: vpSyms, newRHS)
+                LabelDef(newCtx.label, newThis :: vpSyms, mkAttributedCastHack(newRHS, newCtx.label.tpe.resultType))
               ))
             }
             else {
@@ -373,6 +376,13 @@ abstract class TailCalls extends Transform {
           super.transform(tree)
       }
     }
+
+    // Workaround for SI-6900. Uncurry installs an InfoTransformer and a tree Transformer.
+    // These leave us with conflicting view on method signatures; the parameter symbols in
+    // the MethodType can be clones of the ones originally found on the parameter ValDef, and
+    // consequently appearing in the typechecked RHS of the method.
+    private def mkAttributedCastHack(tree: Tree, tpe: Type) =
+      gen.mkAttributedCast(tree, tpe)
   }
 
   // collect the LabelDefs (generated by the pattern matcher) in a DefDef that are in tail position