Merge pull request swiftlang#72178 from tshortli/suppress-objc-async-sibling-missing-witness-diags

tshortli · web-flow · commit 8c5f44fee848 · 2024-03-08T07:16:12.000-08:00
diff --git a/lib/Sema/TypeCheckProtocol.cpp b/lib/Sema/TypeCheckProtocol.cpp
@@ -4391,11 +4391,12 @@ ConformanceChecker::resolveWitnessViaLookup(ValueDecl *requirement) {
     return ResolveWitnessResult::ExplicitFailed;
   }
 
+  if (!shouldRecordMissingWitness(Proto, Conformance, requirement))
+    return ResolveWitnessResult::Missing;
 
   if (!numViable) {
     // Save the missing requirement for later diagnosis.
-    if (shouldRecordMissingWitness(Proto, Conformance, requirement))
-      getASTContext().addDelayedMissingWitness(Conformance, {requirement, matches});
+    getASTContext().addDelayedMissingWitness(Conformance, {requirement, matches});
     return ResolveWitnessResult::Missing;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -4391,11 +4391,12 @@ ConformanceChecker::resolveWitnessViaLookup(ValueDecl *requirement) {`
`4391`	`4391`	`return ResolveWitnessResult::ExplicitFailed;`
`4392`	`4392`	`}`
`4393`	`4393`
	`4394`	`+ if (!shouldRecordMissingWitness(Proto, Conformance, requirement))`
	`4395`	`+ return ResolveWitnessResult::Missing;`
`4394`	`4396`
`4395`	`4397`	`if (!numViable) {`
`4396`	`4398`	`// Save the missing requirement for later diagnosis.`
`4397`		`- if (shouldRecordMissingWitness(Proto, Conformance, requirement))`
`4398`		`- getASTContext().addDelayedMissingWitness(Conformance, {requirement, matches});`
	`4399`	`+ getASTContext().addDelayedMissingWitness(Conformance, {requirement, matches});`
`4399`	`4400`	`return ResolveWitnessResult::Missing;`
`4400`	`4401`	`}`
`4401`	`4402`