Merge commit 'a170c99' into 2.12.x

32 files changed, 45 insertions, 1 deletions

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/t9370/sample_2.flags b/test/files/pos/t9370/sample_2.flags
index 03baca3030..dd7eb55d33 100644
--- a/test/files/pos/t9370/sample_2.flags
+++ b/test/files/pos/t9370/sample_2.flags
@@ -1 +1 @@
--Xplugin:/tmp:. -Xplugin-require:timebomb -Ystop-after:parser
+-Xplugin:/tmp -Xplugin:. -Xplugin-require:timebomb -Ystop-after:parser
diff --git a/test/files/pos/t9475.scala b/test/files/pos/t9475.scala
new file mode 100644
index 0000000000..ce9c250ace
--- /dev/null
+++ b/test/files/pos/t9475.scala
@@ -0,0 +1,19 @@
+trait Ctx {
+  trait Tree
+}
+
+trait Lst[+A] {
+  def zip[A1 >: A, B](that: Lst[B]): Nothing
+}
+
+object Test {
+
+  // both of these methods should be transformed by uncurry
+  // such that List[c.Tree] becomes List[Ctx#Tree]:
+  def foo1(c: Ctx)(l: Lst[c.Tree]) = l zip l
+  def foo2[@specialized T](c: Ctx)(l: Lst[c.Tree], t: T) = l zip l
+
+  // if this doesn't happen for the 2nd method, the specialization
+  // transformation fails
+}
+