1 files changed, 25 insertions, 0 deletions

diff --git a/crates/hir_ty/src/diagnostics/match_check.rs b/crates/hir_ty/src/diagnostics/match_check.rs
index 1d250413d..a9a99f57a 100644
--- a/crates/hir_ty/src/diagnostics/match_check.rs
+++ b/crates/hir_ty/src/diagnostics/match_check.rs
@@ -25,6 +25,7 @@ pub(crate) enum PatternError {
     Unimplemented,
     UnresolvedVariant,
     MissingField,
+    ExtraFields,
 }
 
 #[derive(Clone, Debug, PartialEq)]
@@ -182,6 +183,11 @@ impl<'a> PatCtxt<'a> {
         expected_len: usize,
         ellipsis: Option<usize>,
     ) -> Vec<FieldPat> {
+        if pats.len() > expected_len {
+            self.errors.push(PatternError::ExtraFields);
+            return Vec::new();
+        }
+
         pats.iter()
             .enumerate_and_adjust(expected_len, ellipsis)
             .map(|(i, &subpattern)| FieldPat {
@@ -703,6 +709,25 @@ fn main() {
     }
 
     #[test]
+    fn malformed_match_arm_extra_fields() {
+        check_diagnostics(
+            r#"
+enum A { B(isize, isize), C }
+fn main() {
+    match A::B(1, 2) {
+        A::B(_, _, _) => (),
+    //  ^^^^^^^^^^^^^ Internal: match check bailed out
+    }
+    match A::B(1, 2) {
+        A::C(_) => (),
+    //  ^^^^^^^ Internal: match check bailed out
+    }
+}
+"#,
+        );
+    }
+
+    #[test]
     fn expr_diverges() {
         check_diagnostics(
             r#"