Witness selection should pick exact matches for effect overloads

lib/Sema/TypeCheckProtocol.cpp

@@ -1196,9 +1196,13 @@ swift::matchWitness(WitnessChecker::RequirementEnvironmentCache &reqEnvCache,
       matchKind = MatchKind::RenamedMatch;
     else if (requiresNonSendable)
       matchKind = MatchKind::RequiresNonSendable;
-    else if (getEffects(witness).containsOnly(getEffects(req)))
+    else if (getEffects(req) - getEffects(witness))
+      // when the difference is non-empty, the witness has fewer effects.
       matchKind = MatchKind::FewerEffects;
 
+    assert(getEffects(req).contains(getEffects(witness))
+               && "witness has more effects than requirement?");
+
     // Success. Form the match result.
     RequirementMatch result(witness,
                             matchKind,

test/Interpreter/async_witness_matching.swift

@@ -0,0 +1,26 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-build-swift  -Xfrontend -disable-availability-checking %s -o %t/main
+// RUN: %target-codesign %t/main
+// RUN: %target-run %t/main | %FileCheck %s
+
+// REQUIRES: concurrency
+// REQUIRES: executable_test
+// REQUIRES: concurrency_runtime
+
+// Ensures the more exact witness from S is chosen
+// to fulfill the requirement from P.
+// See: https://github.com/apple/swift/issues/60318
+
+protocol P {
+  func foo() async -> String
+}
+
+struct S: P {
+  func foo() -> String { "plain" }
+  func foo() async -> String { "async" }
+}
+
+let p: P = S()
+let ans = await p.foo()
+print(ans)
+// CHECK: async