Merge remote-tracking branch 'origin/2.11.x' into topic/completely-2.11

76 files changed, 39 insertions, 0 deletions

diff --git a/test/disabled/pos/t1545.scala b/test/disabled/pos/t1545.scala
index 4c5908b8a1..4c5908b8a1 100755..100644
--- a/test/disabled/pos/t1545.scala
+++ b/test/disabled/pos/t1545.scala
diff --git a/test/files/bench/equality/eq.scala b/test/files/bench/equality/eq.scala
index 8ac5b5ef5c..8ac5b5ef5c 100755..100644
--- a/test/files/bench/equality/eq.scala
+++ b/test/files/bench/equality/eq.scala
diff --git a/test/files/bench/equality/eqeq.scala b/test/files/bench/equality/eqeq.scala
index afccece88a..afccece88a 100755..100644
--- a/test/files/bench/equality/eqeq.scala
+++ b/test/files/bench/equality/eqeq.scala
diff --git a/test/files/neg/override.scala b/test/files/neg/override.scala
index 7975516061..7975516061 100755..100644
--- a/test/files/neg/override.scala
+++ b/test/files/neg/override.scala
diff --git a/test/files/neg/t2336.scala b/test/files/neg/t2336.scala
index 4cea02b721..4cea02b721 100755..100644
--- a/test/files/neg/t2336.scala
+++ b/test/files/neg/t2336.scala
diff --git a/test/files/neg/t2494.scala b/test/files/neg/t2494.scala
index 71e6bc4bbf..71e6bc4bbf 100755..100644
--- a/test/files/neg/t2494.scala
+++ b/test/files/neg/t2494.scala
diff --git a/test/files/neg/t2773.scala b/test/files/neg/t2773.scala
index aaa6351c83..aaa6351c83 100755..100644
--- a/test/files/neg/t2773.scala
+++ b/test/files/neg/t2773.scala
diff --git a/test/files/neg/t2779.scala b/test/files/neg/t2779.scala
index d025055aa0..d025055aa0 100755..100644
--- a/test/files/neg/t2779.scala
+++ b/test/files/neg/t2779.scala
diff --git a/test/files/neg/t2870.scala b/test/files/neg/t2870.scala
index 4de19242e3..4de19242e3 100755..100644
--- a/test/files/neg/t2870.scala
+++ b/test/files/neg/t2870.scala
diff --git a/test/files/neg/t2918.scala b/test/files/neg/t2918.scala
index ff2be39ae0..ff2be39ae0 100755..100644
--- a/test/files/neg/t2918.scala
+++ b/test/files/neg/t2918.scala
diff --git a/test/files/neg/t3006.scala b/test/files/neg/t3006.scala
index a84b69c842..a84b69c842 100755..100644
--- a/test/files/neg/t3006.scala
+++ b/test/files/neg/t3006.scala
diff --git a/test/files/neg/t3224.scala b/test/files/neg/t3224.scala
index b7af8a67b5..b7af8a67b5 100755..100644
--- a/test/files/neg/t3224.scala
+++ b/test/files/neg/t3224.scala
diff --git a/test/files/neg/t6446-additional.check b/test/files/neg/t6446-additional.check
index a87af2f1e5..a87af2f1e5 100755..100644
--- a/test/files/neg/t6446-additional.check
+++ b/test/files/neg/t6446-additional.check
diff --git a/test/files/neg/t6446-list.check b/test/files/neg/t6446-list.check
index fa5c581941..fa5c581941 100755..100644
--- a/test/files/neg/t6446-list.check
+++ b/test/files/neg/t6446-list.check
diff --git a/test/files/neg/t6446-missing.check b/test/files/neg/t6446-missing.check
index 029c8057c3..029c8057c3 100755..100644
--- a/test/files/neg/t6446-missing.check
+++ b/test/files/neg/t6446-missing.check
diff --git a/test/files/neg/t771.scala b/test/files/neg/t771.scala
index 26bf441648..26bf441648 100755..100644
--- a/test/files/neg/t771.scala
+++ b/test/files/neg/t771.scala
diff --git a/test/files/pos/lexical.scala b/test/files/pos/lexical.scala
index 8c29513bb5..8c29513bb5 100755..100644
--- a/test/files/pos/lexical.scala
+++ b/test/files/pos/lexical.scala
diff --git a/test/files/pos/packageobjs.scala b/test/files/pos/packageobjs.scala
index ccab133716..ccab133716 100755..100644
--- a/test/files/pos/packageobjs.scala
+++ b/test/files/pos/packageobjs.scala
diff --git a/test/files/pos/spec-t6286.scala b/test/files/pos/spec-t6286.scala
index 4d87998ec6..4d87998ec6 100755..100644
--- a/test/files/pos/spec-t6286.scala
+++ b/test/files/pos/spec-t6286.scala
diff --git a/test/files/pos/t1459/AbstractBase.java b/test/files/pos/t1459/AbstractBase.java
index 492419416c..492419416c 100755..100644
--- a/test/files/pos/t1459/AbstractBase.java
+++ b/test/files/pos/t1459/AbstractBase.java
diff --git a/test/files/pos/t1459/App.scala b/test/files/pos/t1459/App.scala
index 36e5022e94..36e5022e94 100755..100644
--- a/test/files/pos/t1459/App.scala
+++ b/test/files/pos/t1459/App.scala
diff --git a/test/files/pos/t1459/Caller.java b/test/files/pos/t1459/Caller.java
index 4ae51d8c57..4ae51d8c57 100755..100644
--- a/test/files/pos/t1459/Caller.java
+++ b/test/files/pos/t1459/Caller.java
diff --git a/test/files/pos/t1722/Test.scala b/test/files/pos/t1722/Test.scala
index f236d3fdc4..f236d3fdc4 100755..100644
--- a/test/files/pos/t1722/Test.scala
+++ b/test/files/pos/t1722/Test.scala
diff --git a/test/files/pos/t1722/Top.scala b/test/files/pos/t1722/Top.scala
index 4ac52412aa..4ac52412aa 100755..100644
--- a/test/files/pos/t1722/Top.scala
+++ b/test/files/pos/t1722/Top.scala
diff --git a/test/files/pos/t1756.scala b/test/files/pos/t1756.scala
index 1d067c3b04..1d067c3b04 100755..100644
--- a/test/files/pos/t1756.scala
+++ b/test/files/pos/t1756.scala
diff --git a/test/files/pos/t2060.scala b/test/files/pos/t2060.scala
index 2c701150e4..2c701150e4 100755..100644
--- a/test/files/pos/t2060.scala
+++ b/test/files/pos/t2060.scala
diff --git a/test/files/pos/t2082.scala b/test/files/pos/t2082.scala
index 3a160612fe..3a160612fe 100755..100644
--- a/test/files/pos/t2082.scala
+++ b/test/files/pos/t2082.scala
diff --git a/test/files/pos/t2179.scala b/test/files/pos/t2179.scala
index 89e22b6e2a..89e22b6e2a 100755..100644
--- a/test/files/pos/t2179.scala
+++ b/test/files/pos/t2179.scala
diff --git a/test/files/pos/t2425.scala b/test/files/pos/t2425.scala
index 477d5467aa..477d5467aa 100755..100644
--- a/test/files/pos/t2425.scala
+++ b/test/files/pos/t2425.scala
diff --git a/test/files/pos/t2429.scala b/test/files/pos/t2429.scala
index 550681b6a2..550681b6a2 100755..100644
--- a/test/files/pos/t2429.scala
+++ b/test/files/pos/t2429.scala
diff --git a/test/files/pos/t2433/A.java b/test/files/pos/t2433/A.java
index 340690c402..340690c402 100755..100644
--- a/test/files/pos/t2433/A.java
+++ b/test/files/pos/t2433/A.java
diff --git a/test/files/pos/t2433/B.java b/test/files/pos/t2433/B.java
index 151dd71ca1..151dd71ca1 100755..100644
--- a/test/files/pos/t2433/B.java
+++ b/test/files/pos/t2433/B.java
diff --git a/test/files/pos/t2433/Test.scala b/test/files/pos/t2433/Test.scala
index 02fd89b646..02fd89b646 100755..100644
--- a/test/files/pos/t2433/Test.scala
+++ b/test/files/pos/t2433/Test.scala
diff --git a/test/files/pos/t2484.scala b/test/files/pos/t2484.scala
index 88da6aaac8..88da6aaac8 100755..100644
--- a/test/files/pos/t2484.scala
+++ b/test/files/pos/t2484.scala
diff --git a/test/files/pos/t2504.scala b/test/files/pos/t2504.scala
index 67f8226852..67f8226852 100755..100644
--- a/test/files/pos/t2504.scala
+++ b/test/files/pos/t2504.scala
diff --git a/test/files/pos/t2545.scala b/test/files/pos/t2545.scala
index 6ad994223c..6ad994223c 100755..100644
--- a/test/files/pos/t2545.scala
+++ b/test/files/pos/t2545.scala
diff --git a/test/files/pos/t2635.scala b/test/files/pos/t2635.scala
index 7cd5531356..7cd5531356 100755..100644
--- a/test/files/pos/t2635.scala
+++ b/test/files/pos/t2635.scala
diff --git a/test/files/pos/t2683.scala b/test/files/pos/t2683.scala
index 4ba34b554a..4ba34b554a 100755..100644
--- a/test/files/pos/t2683.scala
+++ b/test/files/pos/t2683.scala
diff --git a/test/files/pos/t2913.scala b/test/files/pos/t2913.scala
index 11d8b92053..11d8b92053 100755..100644
--- a/test/files/pos/t2913.scala
+++ b/test/files/pos/t2913.scala
diff --git a/test/files/pos/t2956/t2956.scala b/test/files/pos/t2956/t2956.scala
index eb6e817465..eb6e817465 100755..100644
--- a/test/files/pos/t2956/t2956.scala
+++ b/test/files/pos/t2956/t2956.scala
diff --git a/test/files/pos/t3174.scala b/test/files/pos/t3174.scala
index c3d90a4946..c3d90a4946 100755..100644
--- a/test/files/pos/t3174.scala
+++ b/test/files/pos/t3174.scala
diff --git a/test/files/pos/t3174b.scala b/test/files/pos/t3174b.scala
index 4df1bfe837..4df1bfe837 100755..100644
--- a/test/files/pos/t3174b.scala
+++ b/test/files/pos/t3174b.scala
diff --git a/test/files/pos/t3568.scala b/test/files/pos/t3568.scala
index c8e3fcc4be..c8e3fcc4be 100755..100644
--- a/test/files/pos/t3568.scala
+++ b/test/files/pos/t3568.scala
diff --git a/test/files/pos/t4553.scala b/test/files/pos/t4553.scala
index 4eefe57b2b..4eefe57b2b 100755..100644
--- a/test/files/pos/t4553.scala
+++ b/test/files/pos/t4553.scala
diff --git a/test/files/pos/t9369.flags b/test/files/pos/t9369.flags
new file mode 100644
index 0000000000..b5a8748652
--- /dev/null
+++ b/test/files/pos/t9369.flags
@@ -0,0 +1 @@
+-Xfatal-warnings -unchecked
diff --git a/test/files/pos/t9369.scala b/test/files/pos/t9369.scala
new file mode 100644
index 0000000000..94be2ea4e7
--- /dev/null
+++ b/test/files/pos/t9369.scala
@@ -0,0 +1,24 @@
+object Test {
+
+  trait Tree
+
+  sealed abstract class Prop
+
+  trait Simple extends Prop
+
+  case class Atom(tree: Tree) extends Prop with Simple
+
+  case class Not(prop: Prop) extends Prop with Simple
+
+  def simplify1(prop: Prop): Prop = prop match {
+    case Atom(tree) => ???
+    case Not(prop)  => ???
+    case _          => ???
+  }
+
+  def simplify2(prop: Prop): Prop = prop match {
+    case Not(Atom(tree)) => ???
+    case Not(Not(prop))  => ???
+    case _               => ???
+  }
+}
\ No newline at end of file
diff --git a/test/files/pos/t9442.scala b/test/files/pos/t9442.scala
new file mode 100644
index 0000000000..2ea81e79cb
--- /dev/null
+++ b/test/files/pos/t9442.scala
@@ -0,0 +1,14 @@
+trait Ctx {
+  trait Tree
+}
+trait Lst[+A] {
+  def zip[A1 >: A, B](that: Lst[B]): Nothing
+}
+class C[@specialized(Int) T] {
+  def moo(t: T) = {
+    def foo1(c: Ctx)(l: Lst[c.Tree]) = l zip l
+    def foo2(c: Ctx)(l: Lst[c.Tree]*) = l(0) zip l(1)
+    def foo3(c: Ctx)(l: => Lst[c.Tree]) = l zip l
+    ???
+  }
+}
diff --git a/test/files/presentation/doc/doc.scala b/test/files/presentation/doc/doc.scala
index f2233f1828..f2233f1828 100755..100644
--- a/test/files/presentation/doc/doc.scala
+++ b/test/files/presentation/doc/doc.scala
diff --git a/test/files/presentation/doc/src/Class.scala b/test/files/presentation/doc/src/Class.scala
index a974bd6f5c..a974bd6f5c 100755..100644
--- a/test/files/presentation/doc/src/Class.scala
+++ b/test/files/presentation/doc/src/Class.scala
diff --git a/test/files/presentation/doc/src/p/Base.scala b/test/files/presentation/doc/src/p/Base.scala
index d91632b6f6..d91632b6f6 100755..100644
--- a/test/files/presentation/doc/src/p/Base.scala
+++ b/test/files/presentation/doc/src/p/Base.scala
diff --git a/test/files/presentation/doc/src/p/Derived.scala b/test/files/presentation/doc/src/p/Derived.scala
index 1a9c9a26d1..1a9c9a26d1 100755..100644
--- a/test/files/presentation/doc/src/p/Derived.scala
+++ b/test/files/presentation/doc/src/p/Derived.scala
diff --git a/test/files/run/list_map.scala b/test/files/run/list_map.scala
index fba3aae228..fba3aae228 100755..100644
--- a/test/files/run/list_map.scala
+++ b/test/files/run/list_map.scala
diff --git a/test/files/run/t2127.scala b/test/files/run/t2127.scala
index 839c8d6a5c..839c8d6a5c 100755..100644
--- a/test/files/run/t2127.scala
+++ b/test/files/run/t2127.scala
diff --git a/test/files/run/t2503.scala b/test/files/run/t2503.scala
index 21801e2dbd..21801e2dbd 100755..100644
--- a/test/files/run/t2503.scala
+++ b/test/files/run/t2503.scala
diff --git a/test/files/run/t3026.scala b/test/files/run/t3026.scala
index 22dde9cc03..22dde9cc03 100755..100644
--- a/test/files/run/t3026.scala
+++ b/test/files/run/t3026.scala
diff --git a/test/files/run/t5699.check b/test/files/run/t5699.check
index df19644ae6..df19644ae6 100755..100644
--- a/test/files/run/t5699.check
+++ b/test/files/run/t5699.check
diff --git a/test/files/run/t5699.scala b/test/files/run/t5699.scala
index 409bcd250c..409bcd250c 100755..100644
--- a/test/files/run/t5699.scala
+++ b/test/files/run/t5699.scala
diff --git a/test/files/run/t5717.scala b/test/files/run/t5717.scala
index a0997f5a49..a0997f5a49 100755..100644
--- a/test/files/run/t5717.scala
+++ b/test/files/run/t5717.scala
diff --git a/test/files/run/t7246.check b/test/files/run/t7246.check
index ce01362503..ce01362503 100755..100644
--- a/test/files/run/t7246.check
+++ b/test/files/run/t7246.check
diff --git a/test/files/run/t7246/Outer.java b/test/files/run/t7246/Outer.java
index 163276fb3b..163276fb3b 100755..100644
--- a/test/files/run/t7246/Outer.java
+++ b/test/files/run/t7246/Outer.java
diff --git a/test/files/run/t7246/Test.scala b/test/files/run/t7246/Test.scala
index 9f23ca8f3a..9f23ca8f3a 100755..100644
--- a/test/files/run/t7246/Test.scala
+++ b/test/files/run/t7246/Test.scala
diff --git a/test/files/run/t7246b.check b/test/files/run/t7246b.check
index 5073bd8617..5073bd8617 100755..100644
--- a/test/files/run/t7246b.check
+++ b/test/files/run/t7246b.check
diff --git a/test/files/run/t7246b/Base.scala b/test/files/run/t7246b/Base.scala
index 4e71d3313d..4e71d3313d 100755..100644
--- a/test/files/run/t7246b/Base.scala
+++ b/test/files/run/t7246b/Base.scala
diff --git a/test/files/run/t7246b/Outer.java b/test/files/run/t7246b/Outer.java
index 53a79316ef..53a79316ef 100755..100644
--- a/test/files/run/t7246b/Outer.java
+++ b/test/files/run/t7246b/Outer.java
diff --git a/test/files/run/t7246b/Test.scala b/test/files/run/t7246b/Test.scala
index f0982ea8d0..f0982ea8d0 100755..100644
--- a/test/files/run/t7246b/Test.scala
+++ b/test/files/run/t7246b/Test.scala
diff --git a/test/files/run/t7341.flags b/test/files/run/t7341.flags
index ae08446055..ae08446055 100755..100644
--- a/test/files/run/t7341.flags
+++ b/test/files/run/t7341.flags
diff --git a/test/files/run/t7341.scala b/test/files/run/t7341.scala
index ffea7f918b..ffea7f918b 100755..100644
--- a/test/files/run/t7341.scala
+++ b/test/files/run/t7341.scala
diff --git a/test/files/run/viewtest.scala b/test/files/run/viewtest.scala
index 581958e9a6..581958e9a6 100755..100644
--- a/test/files/run/viewtest.scala
+++ b/test/files/run/viewtest.scala
diff --git a/test/files/run/weakconform.scala b/test/files/run/weakconform.scala
index 30a12b9298..30a12b9298 100755..100644
--- a/test/files/run/weakconform.scala
+++ b/test/files/run/weakconform.scala
diff --git a/test/pending/run/t3609.scala b/test/pending/run/t3609.scala
index eb25afd667..eb25afd667 100755..100644
--- a/test/pending/run/t3609.scala
+++ b/test/pending/run/t3609.scala
diff --git a/test/scaladoc/run/SI-191.check b/test/scaladoc/run/SI-191.check
index 3925a0d464..3925a0d464 100755..100644
--- a/test/scaladoc/run/SI-191.check
+++ b/test/scaladoc/run/SI-191.check
diff --git a/test/scaladoc/run/SI-191.scala b/test/scaladoc/run/SI-191.scala
index 29b1e7dd29..29b1e7dd29 100755..100644
--- a/test/scaladoc/run/SI-191.scala
+++ b/test/scaladoc/run/SI-191.scala
diff --git a/test/scaladoc/run/SI-7367.check b/test/scaladoc/run/SI-7367.check
index 3925a0d464..3925a0d464 100755..100644
--- a/test/scaladoc/run/SI-7367.check
+++ b/test/scaladoc/run/SI-7367.check
diff --git a/test/scaladoc/run/SI-7367.scala b/test/scaladoc/run/SI-7367.scala
index 6e5a317932..6e5a317932 100755..100644
--- a/test/scaladoc/run/SI-7367.scala
+++ b/test/scaladoc/run/SI-7367.scala
diff --git a/test/scaladoc/run/SI-8479.scala b/test/scaladoc/run/SI-8479.scala
index 3c91395025..3c91395025 100755..100644
--- a/test/scaladoc/run/SI-8479.scala
+++ b/test/scaladoc/run/SI-8479.scala
diff --git a/test/script-tests/README b/test/script-tests/README
index 7b3291c407..7b3291c407 100755..100644
--- a/test/script-tests/README
+++ b/test/script-tests/README