Merge branch 'master' into execution-context

Conflicts:
	src/library/scala/package.scala

1 files changed, 15 insertions, 0 deletions

diff --git a/test/files/neg/t5352.scala b/test/files/neg/t5352.scala
new file mode 100644
index 0000000000..6ee41f5680
--- /dev/null
+++ b/test/files/neg/t5352.scala
@@ -0,0 +1,15 @@
+object boop {
+  abstract class Bar { protected def f(): Any }
+  class Bar1 extends Bar { protected def f(): Int = 5 }
+  class Bar2 extends Bar { protected def f(): Int = 5 }
+  
+  val xs = List(new Bar1, new Bar2)
+
+  type BarF = { def f(): Int }
+
+  var x: BarF = _
+  x = xs.head
+  x.f
+
+  (new Bar1).f
+}