Merge pull request #3523 from adriaanm/rebase-3514

 Fix pattern inference regression

src/compiler/scala/tools/nsc/typechecker/PatternTypers.scala

@@ -221,10 +221,12 @@ trait PatternTypers {
      * see test/files/../t5189*.scala
      */
     private def convertToCaseConstructor(tree: Tree, caseClass: Symbol, ptIn: Type): Tree = {
-      def untrustworthyPt = (
+      // TODO SI-7886 / SI-5900 This is well intentioned but doesn't quite hit the nail on the head.
+      //      For now, I've put it completely behind -Xstrict-inference.
+      val untrustworthyPt = settings.strictInference && (
            ptIn =:= AnyTpe
         || ptIn =:= NothingTpe
-        || settings.strictInference && ptIn.typeSymbol != caseClass
+        || ptIn.typeSymbol != caseClass
       )
       val variantToSkolem     = new VariantToSkolemMap
       val caseClassType       = tree.tpe.prefix memberType caseClass
@@ -371,4 +373,4 @@ trait PatternTypers {
       }
     }
   }
-}
+}

test/files/neg/t4818.check

@@ -1,6 +1,6 @@
 t4818.scala:4: error: type mismatch;
  found   : Int(5)
- required: A
+ required: Nothing
 	def f(x: Any) = x match { case Fn(f) => f(5) }
                                                   ^
 one error found

test/files/neg/t5189.check

@@ -1,5 +1,5 @@
 t5189.scala:3: error: type mismatch;
- found   : T => U
+ found   : Nothing => Any
  required: Any => Any
   def f(x: Any): Any => Any = x match { case Foo(bar) => bar }
                                                          ^

test/files/neg/t6680a.flags

@@ -0,0 +1 @@
+-Xstrict-inference

test/files/neg/t6829.check

@@ -16,32 +16,32 @@ t6829.scala:49: error: not found: value nextState
         val (s,a,s2) = (state,actions(agent),nextState)
                                              ^
 t6829.scala:50: error: type mismatch;
- found   : s.type (with underlying type T1)
+ found   : s.type (with underlying type Any)
  required: _53.State where val _53: G
         val r = rewards(agent).r(s,a,s2)
                                  ^
 t6829.scala:50: error: type mismatch;
- found   : a.type (with underlying type T2)
+ found   : a.type (with underlying type Any)
  required: _53.Action where val _53: G
         val r = rewards(agent).r(s,a,s2)
                                    ^
 t6829.scala:50: error: type mismatch;
- found   : s2.type (with underlying type T3)
+ found   : s2.type (with underlying type Any)
  required: _53.State where val _53: G
         val r = rewards(agent).r(s,a,s2)
                                      ^
 t6829.scala:51: error: type mismatch;
- found   : s.type (with underlying type T1)
+ found   : s.type (with underlying type Any)
  required: _50.State
         agent.learn(s,a,s2,r): G#Agent
                     ^
 t6829.scala:51: error: type mismatch;
- found   : a.type (with underlying type T2)
+ found   : a.type (with underlying type Any)
  required: _50.Action
         agent.learn(s,a,s2,r): G#Agent
                       ^
 t6829.scala:51: error: type mismatch;
- found   : s2.type (with underlying type T3)
+ found   : s2.type (with underlying type Any)
  required: _50.State
         agent.learn(s,a,s2,r): G#Agent
                         ^

test/files/pos/t5900a.scala

@@ -0,0 +1,9 @@
+case class Transition[S](x: S)
+
+object C
+
+object Test {
+  (??? : Any) match {
+    case Transition(C) =>
+  }
+}

test/pending/neg/t7886b.scala

@@ -0,0 +1,23 @@
+trait Covariant[+A]
+trait Contra[-A] { def accept(p: A): Unit }
+trait Invariant[A] extends Covariant[A] with Contra[A]
+
+trait T
+case class Unravel[A](m: Contra[A], msg: A) extends T
+
+object Test extends Covariant[Any] {
+  def g(m: Contra[Any]): Unit = m accept 5
+  def f(x: T): Unit = x match {
+    case Unravel(m, msg) => g(m)
+    case _               =>
+  }
+  def main(args: Array[String]) {
+    f(Unravel[String](new Contra[String] { def accept(x: String) = x.length }, ""))
+  }
+}
+// java.lang.ClassCastException: java.lang.Integer cannot be cast to java.lang.String
+//   at Test$$anon$1.accept(a.scala:18)
+//   at Test$.g(a.scala:13)
+//   at Test$.f(a.scala:15)
+//   at Test$.main(a.scala:18)
+//   at Test.main(a.scala)