Merge pull request #58666 from xedin/rdar-92327807-5.7

[5.7][CSSimplify] Don't attempt to synthesize ~= for optional base types

Author: hborla

lib/Sema/CSSimplify.cpp

@@ -9205,17 +9205,21 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyMemberConstraint(
               dyn_cast<EnumElementPattern>(patternLoc->getPattern())) {
         auto enumType = baseObjTy->getMetatypeInstanceType();
 
-        // If the synthesis of ~= resulted in errors (i.e. broken stdlib)
-        // that would be diagnosed inline, so let's just fall through and
-        // let this situation be diagnosed as a missing member.
-        auto hadErrors = inferEnumMemberThroughTildeEqualsOperator(
+        // Optional base type does not trigger `~=` synthesis, but it tries
+        // to find member on both `Optional` and its wrapped type.
+        if (!enumType->getOptionalObjectType()) {
+          // If the synthesis of ~= resulted in errors (i.e. broken stdlib)
+          // that would be diagnosed inline, so let's just fall through and
+          // let this situation be diagnosed as a missing member.
+          auto hadErrors = inferEnumMemberThroughTildeEqualsOperator(
             *this, enumElement, enumType, memberTy, locator);
 
-        // Let's consider current member constraint solved because it's
-        // replaced by a new set of constraints that would resolve member
-        // type.
-        if (!hadErrors)
-          return SolutionKind::Solved;
+          // Let's consider current member constraint solved because it's
+          // replaced by a new set of constraints that would resolve member
+          // type.
+          if (!hadErrors)
+            return SolutionKind::Solved;
+        }
       }
     }
   }

validation-test/Sema/type_checker_crashers_fixed/rdar92327807.swift

@@ -0,0 +1,31 @@
+// RUN: %target-typecheck-verify-swift
+
+enum MyEnum {
+case test(Int)
+}
+
+func test(result: MyEnum, optResult: MyEnum?) {
+  if let .co = result { // expected-error {{pattern matching in a condition requires the 'case' keyword}}
+    // expected-error@-1 {{type 'MyEnum' has no member 'co'}}
+  }
+
+  if let .co(42) = result { // expected-error {{pattern matching in a condition requires the 'case' keyword}}
+    // expected-error@-1 {{type of expression is ambiguous without more context}}
+  }
+
+  if let .co = optResult { // expected-error {{pattern matching in a condition requires the 'case' keyword}}
+    // expected-error@-1 {{type 'MyEnum?' has no member 'co'}}
+  }
+
+  let _ = {
+    if let .co = result { // expected-error 2 {{pattern matching in a condition requires the 'case' keyword}}
+      // expected-error@-1 {{type 'MyEnum' has no member 'co'}}
+    }
+  }
+
+  let _ = {
+    if let .co = optResult { // expected-error 2 {{pattern matching in a condition requires the 'case' keyword}}
+      // expected-error@-1 {{type 'MyEnum?' has no member 'co'}}
+    }
+  }
+}