Merge commit 'fcc20fe' into merge/2.11-to-2.12-apr-1

1 files changed, 34 insertions, 0 deletions

diff --git a/test/files/run/t9097.scala b/test/files/run/t9097.scala
new file mode 100644
index 0000000000..d2bf55fc44
--- /dev/null
+++ b/test/files/run/t9097.scala
@@ -0,0 +1,34 @@
+import scala.tools.partest._
+import java.io.{Console => _, _}
+
+object Test extends StoreReporterDirectTest {
+
+  override def extraSettings: String = List(
+    "-usejavacp",
+    "-Xfatal-warnings",
+    "-Ybackend:GenBCode",
+    "-Ydelambdafy:method",
+    "-Xprint:delambdafy",
+    s"-d ${testOutput.path}"
+  ) mkString " "
+
+  override def code = """package o
+                        |package a {
+                        |  class C {
+                        |    def hihi = List(1,2).map(_ * 2)
+                        |  }
+                        |}
+                        |package object a {
+                        |  def f = 1
+                        |}
+                        |""".stripMargin.trim
+
+  override def show(): Unit = {
+    val baos = new java.io.ByteArrayOutputStream()
+    Console.withOut(baos)(Console.withErr(baos)(compile()))
+    assert(!storeReporter.hasErrors, message = filteredInfos map (_.msg) mkString "; ")
+    val out = baos.toString("UTF-8")
+    // was 2 before the fix, the two PackageDefs for a would both contain the ClassDef for the closure
+    assert(out.lines.count(_ contains "class hihi$1") == 1, out)
+  }
+}