7 files changed, 98 insertions, 0 deletions
diff --git a/test/files/run/t6715.scala b/test/files/run/t6715.scala
new file mode 100644
index 0000000000..07ff34218a
--- /dev/null
+++ b/test/files/run/t6715.scala
@@ -0,0 +1,15 @@
+import scala.reflect.runtime.universe._
+
+class A {
+  def $$ = 1
+  def $times = 1
+}
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    val memberSet: Set[String] = typeOf[A].members.map{ _.toString }.toSet
+    assert(memberSet contains "method *")
+    assert(memberSet contains "method $$")
+    assert(! (memberSet contains "method"))
+  }
+}
diff --git a/test/files/run/t6793.scala b/test/files/run/t6793.scala
new file mode 100644
index 0000000000..0b1f1619af
--- /dev/null
+++ b/test/files/run/t6793.scala
@@ -0,0 +1,9 @@
+package a { class C1(private[a] val v0: String) }
+package b { class C2(v1: String) extends a.C1(v1) { def foo = v1 } }
+
+object Test extends App {
+  new b.C2("x")
+
+  val c2Fields = classOf[b.C2].getDeclaredFields
+  assert(c2Fields.size == 1, c2Fields.map(_.getName).toList)
+}
diff --git a/test/files/run/t6793b.scala b/test/files/run/t6793b.scala
new file mode 100644
index 0000000000..cb3f2fb2fa
--- /dev/null
+++ b/test/files/run/t6793b.scala
@@ -0,0 +1,11 @@
+package a {
+  class C1(val v0: String)
+  class C2(v1: String) extends a.C1(v1) { def foo = v1 }
+}
+
+object Test extends App {
+  new a.C2("x")
+
+  val c2Fields = classOf[a.C2].getDeclaredFields
+  assert(c2Fields.isEmpty, c2Fields.map(_.getName).mkString(", "))
+}
diff --git a/test/files/run/t6793c.scala b/test/files/run/t6793c.scala
new file mode 100644
index 0000000000..e28c7c81a1
--- /dev/null
+++ b/test/files/run/t6793c.scala
@@ -0,0 +1,11 @@
+package a {
+  class C1(private[a] val v0: String)
+  class C2(v1: String) extends a.C1(v1) { def foo = v1 }
+}
+
+object Test extends App {
+  new a.C2("x").foo
+
+  val c2Fields = classOf[a.C2].getDeclaredFields
+  assert(c2Fields.isEmpty, c2Fields.map(_.getName).toList)
+}
diff --git a/test/files/run/t6900.scala b/test/files/run/t6900.scala
new file mode 100644
index 0000000000..a29d388129
--- /dev/null
+++ b/test/files/run/t6900.scala
@@ -0,0 +1,36 @@
+import annotation.tailrec
+
+trait Universe {
+  type T <: AnyRef
+}
+
+final class Bug {
+  var i = 1
+  def stop() = { i -= 1; i < 0 }
+  // the alias bypasses the fast path in erasures InfoTransformer
+  // predicated on `TypeMap.noChangeToSymbols`
+  type Alias = Any
+
+  @tailrec
+  // So we get two symbols for `universe`, the original on the ValDef
+  // and a clone in the MethodType of `f`.
+  def f(universe: Universe, l: Alias): universe.T = {
+    if (stop()) null.asInstanceOf[universe.T] else f(universe, null)
+  }
+
+  @tailrec
+  def g(universe: Universe)(l: Alias): universe.T = {
+    if (stop()) null.asInstanceOf[universe.T] else g(universe)(l)
+  }
+
+  @tailrec
+  def h(universe: Universe)(l: List[universe.T]): List[universe.T] = {
+    if (stop()) Nil else h(universe)(l)
+  }
+}
+
+object Test extends App {
+  assert(new Bug().f(null, null) == null)
+  assert(new Bug().g(null)(null) == null)
+  assert(new Bug().h(null)(null) == Nil)
+}
+\ No newline at end of file
diff --git a/test/scaladoc/run/SI-6715.check b/test/scaladoc/run/SI-6715.check
new file mode 100644
index 0000000000..619c56180b
--- /dev/null
+++ b/test/scaladoc/run/SI-6715.check
@@ -0,0 +1 @@
+Done.
diff --git a/test/scaladoc/run/SI-6715.scala b/test/scaladoc/run/SI-6715.scala
new file mode 100644
index 0000000000..92d3376234
--- /dev/null
+++ b/test/scaladoc/run/SI-6715.scala
@@ -0,0 +1,15 @@
+import scala.tools.nsc.doc.model._
+import scala.tools.partest.ScaladocModelTest
+
+object Test extends ScaladocModelTest {
+  def scaladocSettings = ""
+
+  override def code = "object A { def $$ = 123 }"
+
+  def testModel(rootPackage: Package) = {
+    import access._
+
+    val method = rootPackage._object("A")._method("$$")
+    assert(method != null)
+  }
+}