2 files changed, 29 insertions, 0 deletions
diff --git a/test/files/neg/t9629.check b/test/files/neg/t9629.check
new file mode 100644
index 0000000000..4eafa84236
--- /dev/null
+++ b/test/files/neg/t9629.check
@@ -0,0 +1,17 @@
+t9629.scala:4: error: pattern must be a value: Option[Int]
+Note: if you intended to match against the class, try `case _: Option[_]`
+      case Option[Int] => // error was issued before
+                 ^
+t9629.scala:5: error: pattern must be a value: Option[Int]
+Note: if you intended to match against the class, try `case _: Option[_]`
+      case Some(Option[Int]) => // error was skipped, patmat issued an internal error
+                      ^
+t9629.scala:8: error: pattern must be a value: Option[Int]
+Note: if you intended to match against the class, try `case _: Option[_]`
+      case (_, Option[Int]) =>
+                     ^
+t9629.scala:9: error: pattern must be a value: Option[Int]
+Note: if you intended to match against the class, try `case _: Option[_]`
+      case x @ (y @ Option[Int]) =>
+                          ^
+four errors found
diff --git a/test/files/neg/t9629.scala b/test/files/neg/t9629.scala
new file mode 100644
index 0000000000..2be2b039f2
--- /dev/null
+++ b/test/files/neg/t9629.scala
@@ -0,0 +1,12 @@
+class Test {
+  def foo(a: Any) {
+    a match {
+      case Option[Int] => // error was issued before
+      case Some(Option[Int]) => // error was skipped, patmat issued an internal error
+
+      // variations
+      case (_, Option[Int]) =>
+      case x @ (y @ Option[Int]) =>
+    }
+  }
+}