Merge branch 'master' into issue/5846,4597,4027,4112

Conflicts:
	src/library/scala/collection/MapLike.scala
	src/library/scala/collection/SortedMapLike.scala

1 files changed, 23 insertions, 0 deletions

diff --git a/test/files/run/t5971.scala b/test/files/run/t5971.scala
new file mode 100644
index 0000000000..dbd9beebb3
--- /dev/null
+++ b/test/files/run/t5971.scala
@@ -0,0 +1,23 @@
+
+
+
+
+
+/** When using `AbstractTransformed` abstract inner class in views in order
+ *  to force generating bridges, one must take care to push the corresponding
+ *  collection trait (such as `Iterable` or `Seq`) as far as possible to the
+ *  left in the linearization order -- otherwise, overridden methods from these
+ *  traits can override the already overridden methods in view. This was the
+ *  case with `takeWhile`.
+ *  Mind blowing, I know.
+ */
+object Test {
+  
+  def main(args: Array[String]) {
+    println("bar".view.reverse.filter(_ > 'a').mkString(","))
+    println("bar".view.reverse.take(1).mkString(","))
+    println("bar".view.reverse.dropWhile(_ > 'a').mkString(","))
+    println("bar".view.reverse.takeWhile(_ => true).mkString(","))
+  }
+  
+}