Merge branch '2.10.x' into topic/inliner-logging

Conflicts:
	src/compiler/scala/tools/nsc/backend/icode/GenICode.scala

1 files changed, 23 insertions, 0 deletions

diff --git a/test/files/run/t5064.scala b/test/files/run/t5064.scala
new file mode 100644
index 0000000000..35f0951765
--- /dev/null
+++ b/test/files/run/t5064.scala
@@ -0,0 +1,23 @@
+import scala.tools.partest._
+
+object Test extends CompilerTest {
+  import global._
+  override def extraSettings = super.extraSettings + " -Yrangepos"
+  override def sources = List(
+    """|class T5064 {
+       |  List(1)
+       |  Seq(1)
+       |  List
+       |  Seq
+       |  Nil
+       |}""".stripMargin
+  )
+  def check(source: String, unit: CompilationUnit) {
+    for (ClassDef(_, _, _, Template(_, _, stats)) <- unit.body ; stat <- stats ; t <- stat) {
+      t match {
+        case _: Select | _: Apply | _: This => println("%-15s %s".format(t.pos.show, t))
+        case _                              =>
+      }
+    }
+  }
+}
\ No newline at end of file