Provide AST Context Getters To Protocol Inference

Author: CodaFi

lib/Sema/CSDiagnostics.cpp

@@ -2613,9 +2613,8 @@ bool ContextualFailure::tryProtocolConformanceFixIt(
   // Let's build a list of protocols that the context does not conform to.
   SmallVector<std::string, 8> missingProtoTypeStrings;
   for (auto protocol : layout.getProtocols()) {
-    if (TypeChecker::conformsToProtocol(FromType, protocol->getDecl(), getDC(),
-                                ConformanceCheckFlags::InExpression)
-            .isInvalid()) {
+    if (!TypeChecker::conformsToProtocol(FromType, protocol->getDecl(), getDC(),
+                                         ConformanceCheckFlags::InExpression)) {
       missingProtoTypeStrings.push_back(protocol->getString());
     }
   }

lib/Sema/CSRanking.cpp

@@ -201,7 +201,7 @@ static bool isNominallySuperclassOf(Type type1, Type type2) {
 /// Determine the relationship between the self types of the given declaration
 /// contexts..
 static std::pair<SelfTypeRelationship, ProtocolConformanceRef>
-computeSelfTypeRelationship(TypeChecker &tc, DeclContext *dc, ValueDecl *decl1,
+computeSelfTypeRelationship(DeclContext *dc, ValueDecl *decl1,
                             ValueDecl *decl2) {
   // If both declarations are operators, even through they
   // might have Self such types are unrelated.
@@ -533,8 +533,7 @@ static bool isDeclAsSpecializedAs(TypeChecker &tc, DeclContext *dc,
       // Determine the relationship between the 'self' types and add the
       // appropriate constraints. The constraints themselves never fail, but
       // they help deduce type variables that were opened.
-      auto selfTypeRelationship =
-          computeSelfTypeRelationship(tc, dc, decl1, decl2);
+      auto selfTypeRelationship = computeSelfTypeRelationship(dc, decl1, decl2);
       auto relationshipKind = selfTypeRelationship.first;
       auto conformance = selfTypeRelationship.second;
       (void)conformance;