Merge pull request scala#10808 from som-snytt/issue/13018-boolean-extraction

NonFatal opt needs type test

Author: lrytz

src/compiler/scala/tools/nsc/transform/patmat/PatternMatching.scala

@@ -80,7 +80,7 @@ trait PatternMatching extends Transform
         if guard.isEmpty && qual.symbol == definitions.NonFatalModule =>
         transform(treeCopy.CaseDef(
           tree,
-          bind,
+          treeCopy.Bind(bind, bind.name, Typed(Ident(nme.WILDCARD), TypeTree(definitions.ThrowableTpe)).setType(definitions.ThrowableTpe)),
           localTyper.typed(atPos(tree.pos)(Apply(gen.mkAttributedRef(definitions.NonFatal_apply), List(Ident(bind.symbol))))),
           body))
 

test/files/run/nonfatal.scala

@@ -12,12 +12,22 @@ object Test extends BytecodeTest {
     val g = getMethod(classNode, "g")
     assertEquals(instructionsFromMethod(f), instructionsFromMethod(g))
     //sameBytecode(f, g) // prints
+    new C().run() // should not crash
   }
 }
 
 class C {
   import scala.util.control.NonFatal
   def x = 42
   def f = try x catch { case NonFatal(e) => e.printStackTrace(); -1 }
-  def g = try x catch { case e if NonFatal(e) => e.printStackTrace(); -1 }
+  def g = try x catch { case e: Throwable if NonFatal(e) => e.printStackTrace(); -1 }
+
+  def run(): Unit = {
+    val any: Any = 42
+
+    any match {
+      case NonFatal(e) => ???
+      case _ =>
+    }
+  }
 }