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

* origin/2.10.x:
  SI-6969, mishandling of SoftReferences in method cache.
  SI-7011 Fix finding constructor type in captured var definitions
  SI-6987 Tests fsc verbose output
  SI-6987 Fixes fsc compile server verbose output
  SI-6231 Report unsupported free var capture by a trait.
  SI-6666 Restrict hidden `this` access in self/super calls.
  SI-6902 Check unreachability under @unchecked
  SI-6976 Fix value class separate compilation crasher.
  Closes SI-6952: add correct error positions for Dynamic feature check.

Conflicts:
	src/compiler/scala/tools/nsc/CompileServer.scala
	src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala

5 files changed, 52 insertions, 0 deletions

diff --git a/test/files/pos/t6976/Exts_1.scala b/test/files/pos/t6976/Exts_1.scala
new file mode 100644
index 0000000000..9b3a69edd9
--- /dev/null
+++ b/test/files/pos/t6976/Exts_1.scala
@@ -0,0 +1,10 @@
+object Exts {
+  implicit class AnyExts[T](val o: T) extends AnyVal {
+    def moo = "moo!"
+  }
+}
+
+trait Exts {
+  import language.implicitConversions
+  implicit def AnyExts[T](o: T) = Exts.AnyExts(o)
+}
diff --git a/test/files/pos/t6976/ImplicitBug_1.scala b/test/files/pos/t6976/ImplicitBug_1.scala
new file mode 100644
index 0000000000..c9031bab2e
--- /dev/null
+++ b/test/files/pos/t6976/ImplicitBug_1.scala
@@ -0,0 +1,27 @@
+// This one is weird and nasty. Not sure if this is scalac or sbt 
+// (tried with 0.12 & 0.12.2-RC2) bug.
+//
+// A level of indirection is required to trigger this bug.
+// Exts seems to need to be defined in separate file.
+//
+// Steps to reproduce:
+// 1. sbt clean
+// 2. sbt run (it works)
+// 3. Comment A & uncomment B.
+// 4. sbt run (it fails)
+// 5. Switch it back & sbt run. It still fails.
+//
+// In this project sbt clean helps. However in a large project where this 
+// bug was found compiler crashed even after doing sbt clean. The only
+// way to work around this was to reference Exts object explicitly (C) in 
+// the source file using its implicit classes.
+
+// Lets suppose this is a mega-trait combining all sorts of helper 
+// functionality.
+trait Support extends Exts
+
+object ImplicitsBug extends App with Support { // A
+// object ImplicitsBug extends App with Exts { // B
+  //Exts // C) this reference helped in the large project.
+  println(3.moo)
+}
diff --git a/test/files/pos/t6976/ImplicitBug_2.scala b/test/files/pos/t6976/ImplicitBug_2.scala
new file mode 100644
index 0000000000..2fea5e2993
--- /dev/null
+++ b/test/files/pos/t6976/ImplicitBug_2.scala
@@ -0,0 +1,7 @@
+trait Support extends Exts
+
+// object ImplicitsBug extends App with Support { // A
+object ImplicitsBug extends App with Exts { // B
+  //Exts // C) this reference helped in the large project.
+  println(3.moo)
+}
diff --git a/test/files/pos/t7011.flags b/test/files/pos/t7011.flags
new file mode 100644
index 0000000000..a4c161553e
--- /dev/null
+++ b/test/files/pos/t7011.flags
@@ -0,0 +1 @@
+-Ydebug -Xfatal-warnings
\ No newline at end of file
diff --git a/test/files/pos/t7011.scala b/test/files/pos/t7011.scala
new file mode 100644
index 0000000000..539f662bc0
--- /dev/null
+++ b/test/files/pos/t7011.scala
@@ -0,0 +1,7 @@
+object bar {
+	def foo {
+    lazy val x = 42
+
+    {()=>x}
+  }
+}
\ No newline at end of file