Fix #1335: Generate null checks for extractors

2 files changed, 18 insertions, 3 deletions

diff --git a/src/dotty/tools/dotc/transform/PatternMatcher.scala b/src/dotty/tools/dotc/transform/PatternMatcher.scala
index 30b94623d..490feb7d0 100644
--- a/src/dotty/tools/dotc/transform/PatternMatcher.scala
+++ b/src/dotty/tools/dotc/transform/PatternMatcher.scala
@@ -253,9 +253,13 @@ class PatternMatcher extends MiniPhaseTransform with DenotTransformer {
               )
           } else {
             assert(defn.isProductSubType(prev.tpe))
-            Block(
-              List(ValDef(b.asTerm, prev)),
-              next //Substitution(b, ref(prevSym))(next)
+            val nullCheck: Tree = prev.select(defn.Object_ne).appliedTo(Literal(Constant(null)))
+            ifThenElseZero(
+              nullCheck,
+              Block(
+                List(ValDef(b.asTerm, prev)),
+                next //Substitution(b, ref(prevSym))(next)
+              )
             )
           }
         }
diff --git a/tests/pos/t1335.scala b/tests/pos/t1335.scala
new file mode 100644
index 000000000..047f7b566
--- /dev/null
+++ b/tests/pos/t1335.scala
@@ -0,0 +1,11 @@
+case class MyTuple(a: Int, b: Int)
+
+object Test {
+  def main(args: Array[String]): Unit =
+    try {
+      val mt: MyTuple = null
+      val MyTuple(a, b) = mt
+    } catch {
+      case e: MatchError => ()
+    }
+}