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.

1 files changed, 37 insertions, 0 deletions

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])
+}