CSDiag & ConformanceChecker: Resolve type witnesses before value witnesses ContextualFailure::tryProtocolConformanceFixIt

AnthonyLatsis · AnthonyLatsis · commit f2b3e7bf9ee7 · 2022-02-25T23:40:45.000+03:00
diff --git a/lib/Sema/CSDiagnostics.cpp b/lib/Sema/CSDiagnostics.cpp
@@ -3149,8 +3149,9 @@ bool ContextualFailure::tryProtocolConformanceFixIt(
           ProtocolConformanceState::Incomplete, /*isUnchecked=*/false);
       ConformanceChecker checker(getASTContext(), &conformance,
                                  missingWitnesses);
-      checker.resolveValueWitnesses();
+      // Type witnesses must be resolved first.
       checker.resolveTypeWitnesses();
+      checker.resolveValueWitnesses();
     }
 
     for (auto decl : missingWitnesses) {
