Merge commit '7ba38a0' into merge/2.11.x-to-2.12.x-20150129

Conflicts:
	build.number
	src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala
	src/library/scala/collection/Iterator.scala
	versions.properties

1 files changed, 35 insertions, 0 deletions

diff --git a/test/files/run/t5938.scala b/test/files/run/t5938.scala
new file mode 100644
index 0000000000..59a95ac37f
--- /dev/null
+++ b/test/files/run/t5938.scala
@@ -0,0 +1,35 @@
+import scala.tools.partest.DirectTest
+
+object Test extends DirectTest {
+
+  override def extraSettings: String =
+    s"-usejavacp -d ${testOutput.path}"
+
+  override def code = """
+object O extends C {
+  def main(args: Array[String]): Unit = {
+  }
+  // Static forwarder for foo and setter_foo_= added more once in a multi-run compile.
+}
+  """.trim
+
+  override def show(): Unit = {
+    val global = newCompiler()
+    Console.withErr(System.out) {
+      compileString(global)(code)
+      compileString(global)(code)
+      loadClass // was "duplicate name and signature in class X"
+    }
+  }
+
+  def loadClass: Class[_] = {
+    val cl = new java.net.URLClassLoader(Array(testOutput.toFile.toURL));
+    cl.loadClass("O")
+  }
+}
+
+trait T {
+  val foo: String = ""
+}
+class C extends T
+