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

* commit 'd392d56d6bf8b0ae9072b354e4ec68becd0df679':
  SI-4602 Disable unreliable test of fsc path absolutization
  Update a checkfile from a recent fix.
  SI-7018 Fix memory leak in Attachments.
  SI-4733 - fsc no longer creates a single temp directory for all users.
  Bumped partest MaxPermSize to 128m.
  SI-6891 Fix value class + tailrec crasher.
  Ill-scoped reference checking in TreeCheckers
  Make value classes TreeCheckers friendly
  SI-4602 Make fsc absolutize source file names
  SI-6863 Fix verify error in captured var inited from expr with try/catch
  SI-6932 Remove Batchable trait plus minor clean-ups
  Fix SI-6932 by enabling linearization of callback execution for the internal execution context of Future
  SI-6443 Expand test coverage with varargs, by-name.
  SI-6443 Widen dependent param types in uncurry

Conflicts:
	src/reflect/scala/reflect/internal/Trees.scala
	test/partest

2 files changed, 27 insertions, 0 deletions

diff --git a/test/files/pos/t6891.flags b/test/files/pos/t6891.flags
new file mode 100644
index 0000000000..fe048006aa
--- /dev/null
+++ b/test/files/pos/t6891.flags
@@ -0,0 +1 @@
+-Ycheck:extmethods -Xfatal-warnings
\ No newline at end of file
diff --git a/test/files/pos/t6891.scala b/test/files/pos/t6891.scala
new file mode 100644
index 0000000000..bed2d0d777
--- /dev/null
+++ b/test/files/pos/t6891.scala
@@ -0,0 +1,26 @@
+object O {
+  implicit class Foo[A](val value: String) extends AnyVal {
+    def bippy() = {
+      @annotation.tailrec def loop(x: A): Unit = loop(x)
+      ()
+    }
+
+    def boppy() = {
+      @annotation.tailrec def loop(x: value.type): Unit = loop(x)
+      ()
+    }
+
+    def beppy[C](c: => C) = {
+      () => c
+      @annotation.tailrec def loop(x: value.type): Unit = loop(x)
+        () => c
+      ()
+    }
+  }
+  // uncaught exception during compilation: Types$TypeError("type mismatch;
+  //  found   : A(in method bippy$extension)
+  //  required: A(in class Foo)") @ scala.tools.nsc.typechecker.Contexts$Context.issueCommon(Contexts.scala:396)
+  // error: scala.reflect.internal.Types$TypeError: type mismatch;
+  //  found   : A(in method bippy$extension)
+  //  required: A(in class Foo)
+}