Fix @varargs forwarder generation in the presence of nested templates.

Makes `newMembers` a Map[Symbol, Buffer[Tree]] to ensure we add the forwarders to the right template.

Closes SI-5125.

4 files changed, 72 insertions, 0 deletions

diff --git a/test/files/run/t5125.check b/test/files/run/t5125.check
new file mode 100644
index 0000000000..d8a0565005
--- /dev/null
+++ b/test/files/run/t5125.check
@@ -0,0 +1,4 @@
+public void O1$.f(java.lang.String[])
+public void O1$.f(scala.collection.Seq)
+public void O2$.f(java.lang.String[])
+public void O2$.f(scala.collection.Seq)
diff --git a/test/files/run/t5125.scala b/test/files/run/t5125.scala
new file mode 100644
index 0000000000..7ec2b929d9
--- /dev/null
+++ b/test/files/run/t5125.scala
@@ -0,0 +1,24 @@
+object O1 {
+  def instance = this
+  @scala.annotation.varargs
+  def f(values:String*) = println("Calling O1.f(): " + values)
+}
+
+object O2 {
+  def instance = this
+  @scala.annotation.varargs
+  def f(values:String*) = println("Calling O2.f(): " + values)
+  // uncommenting g() results in errors in A.java
+  def g(): String => Int = s => s.hashCode
+}
+
+object Test extends App {
+  def check(c: Class[_]) {
+    val methodName = "f"
+    val methods = c.getDeclaredMethods.filter(_.getName == methodName)
+    println(methods.map(_.toString).sorted.mkString("\n"))
+  }
+
+  check(O1.getClass)
+  check(O2.getClass)
+}
\ No newline at end of file
diff --git a/test/files/run/t5125b.check b/test/files/run/t5125b.check
new file mode 100644
index 0000000000..ddbf908f04
--- /dev/null
+++ b/test/files/run/t5125b.check
@@ -0,0 +1,7 @@
+public void C1.f(java.lang.String[])
+public void C1.f(scala.collection.Seq)
+public void C2.f(java.lang.String[])
+public void C2.f(scala.collection.Seq)
+public void C2$C3.f(java.lang.String[])
+public void C2$C3.f(scala.collection.Seq)
+public void C4.f(scala.collection.Seq)
diff --git a/test/files/run/t5125b.scala b/test/files/run/t5125b.scala
new file mode 100644
index 0000000000..3b3596d8bf
--- /dev/null
+++ b/test/files/run/t5125b.scala
@@ -0,0 +1,37 @@
+class C1 {
+  @scala.annotation.varargs
+  def f(values:String*) = println("Calling C1.f(): "  + values)
+}
+
+class C2 {
+  @scala.annotation.varargs
+  def f(values:String*) = println("Calling C2.f(): "  + values)
+  // def g(): String => Int = s => s.hashCode
+  
+  class C3 {
+    @scala.annotation.varargs
+    def f(values:String*) = println("Calling C3.f(): "  + values)
+  }
+}
+
+class C4 {
+  def f(values: String*) = println("Calling C4.f(): " + values)
+
+  locally {
+    @scala.annotation.varargs
+    def f(values: String*) = println("Calling C4.<locally>.f(): " + values)
+  }
+}
+
+object Test extends App {
+  def check(c: Class[_]) {
+    val methodName = "f"
+    val methods = c.getDeclaredMethods.filter(_.getName == methodName)
+    println(methods.map(_.toString).sorted.mkString("\n"))
+  }
+
+  check(classOf[C1])
+  check(classOf[C2])
+  check(classOf[C2#C3])
+  check(classOf[C4])
+}