update on comment

Author: asukaminato0721

pyrefly/lib/binding/function.rs

@@ -912,7 +912,12 @@ fn function_last_expressions<'a>(
                 let mut syntactically_exhaustive = false;
                 for case in x.cases.iter() {
                     f(sys_info, &case.body, res)?;
-                    if pattern_is_syntactically_exhaustive_for_subject(&x.subject, &case.pattern) {
+                    if case.guard.is_none()
+                        && pattern_is_syntactically_exhaustive_for_subject(
+                            &x.subject,
+                            &case.pattern,
+                        )
+                    {
                         syntactically_exhaustive = true;
                         break;
                     }

pyrefly/lib/binding/pattern.rs

@@ -580,8 +580,8 @@ impl<'a> BindingsBuilder<'a> {
                 ..
             } = case;
             self.start_branch();
-            let case_is_irrefutable =
-                pattern_is_syntactically_exhaustive_for_subject(&subject_expr, &pattern);
+            let case_is_irrefutable = guard.is_none()
+                && pattern_is_syntactically_exhaustive_for_subject(&subject_expr, &pattern);
             if case_is_irrefutable {
                 exhaustive = true;
             }

pyrefly/lib/test/pattern_match.rs

@@ -848,6 +848,41 @@ def test(x: int | None, y: int | None) -> int:
 "#,
 );
 
+testcase!(
+    test_match_multi_subject_guarded_tuple_catch_all_is_not_exhaustive,
+    r#"
+from typing import assert_type
+
+def test(x: int | None, y: int | None, cond: bool) -> None:
+    match x, y:
+        case None, None:
+            raise ValueError
+        case int(m), None:
+            u = m * 3
+            v = m
+        case None, int(n):
+            u = n
+            v = n // 3
+        case _, _ if cond:
+            raise ValueError
+
+    assert_type(u, int)  # E: `u` may be uninitialized
+    assert_type(v, int)  # E: `v` may be uninitialized
+"#,
+);
+
+testcase!(
+    test_match_multi_subject_guarded_tuple_catch_all_counts_for_return_analysis,
+    r#"
+def test(x: int | None, y: int | None, cond: bool) -> int: # E: Function declared to return `int`, but one or more paths are missing an explicit `return`
+    match x, y:
+        case None, None:
+            return 0
+        case _, _ if cond:
+            return 1
+"#,
+);
+
 testcase!(
     test_exhaustive_enum_or_pattern_no_missing_return,
     r#"