Sema: Remove unused TypeResolution::Resolver variable

Author: slavapestov

lib/Sema/TypeCheckDecl.cpp

@@ -3808,8 +3808,7 @@ static void validateResultType(ValueDecl *decl,
         : ErrorType::get(decl->getASTContext()));
   } else {
     auto *dc = decl->getInnermostDeclContext();
-    auto resolution = TypeResolution::forInterface(
-      dc, dc->getGenericSignatureOfContext());
+    auto resolution = TypeResolution::forInterface(dc);
     TypeChecker::validateType(dc->getASTContext(),
                               resultTyLoc, resolution,
                               TypeResolverContext::FunctionResult);
@@ -4074,8 +4073,7 @@ void TypeChecker::validateDecl(ValueDecl *D) {
 
     // We want the function to be available for name lookup as soon
     // as it has a valid interface type.
-    auto resolution = TypeResolution::forInterface(FD,
-                                                   FD->getGenericSignature());
+    auto resolution = TypeResolution::forInterface(FD);
     typeCheckParameterList(FD->getParameters(), resolution,
                            TypeResolverContext::AbstractFunctionDecl);
     validateResultType(FD, FD->getBodyResultTypeLoc());
@@ -4114,7 +4112,7 @@ void TypeChecker::validateDecl(ValueDecl *D) {
 
     DeclValidationRAII IBV(CD);
 
-    auto res = TypeResolution::forInterface(CD, CD->getGenericSignature());
+    auto res = TypeResolution::forInterface(CD);
     typeCheckParameterList(CD->getParameters(), res,
                            TypeResolverContext::AbstractFunctionDecl);
     CD->computeType();
@@ -4126,7 +4124,7 @@ void TypeChecker::validateDecl(ValueDecl *D) {
 
     DeclValidationRAII IBV(DD);
 
-    auto res = TypeResolution::forInterface(DD, DD->getGenericSignature());
+    auto res = TypeResolution::forInterface(DD);
     typeCheckParameterList(DD->getParameters(), res,
                            TypeResolverContext::AbstractFunctionDecl);
     DD->computeType();
@@ -4138,7 +4136,7 @@ void TypeChecker::validateDecl(ValueDecl *D) {
 
     DeclValidationRAII IBV(SD);
 
-    auto res = TypeResolution::forInterface(SD, SD->getGenericSignature());
+    auto res = TypeResolution::forInterface(SD);
     typeCheckParameterList(SD->getIndices(), res,
                            TypeResolverContext::SubscriptDecl);
     validateResultType(SD, SD->getElementTypeLoc());
@@ -4154,7 +4152,7 @@ void TypeChecker::validateDecl(ValueDecl *D) {
     DeclValidationRAII IBV(EED);
 
     if (auto *PL = EED->getParameterList()) {
-      auto res = TypeResolution::forInterface(ED, ED->getGenericSignature());
+      auto res = TypeResolution::forInterface(ED);
       typeCheckParameterList(PL, res,
                              TypeResolverContext::EnumElementDecl);
     }

lib/Sema/TypeCheckType.cpp

@@ -58,16 +58,13 @@ TypeResolution TypeResolution::forStructural(DeclContext *dc) {
   return TypeResolution(dc, TypeResolutionStage::Structural);
 }
 
-TypeResolution TypeResolution::forInterface(DeclContext *dc,
-                                            LazyResolver *resolver) {
-  return forInterface(dc, dc->getGenericSignatureOfContext(), resolver);
+TypeResolution TypeResolution::forInterface(DeclContext *dc) {
+  return forInterface(dc, dc->getGenericSignatureOfContext());
 }
 
 TypeResolution TypeResolution::forInterface(DeclContext *dc,
-                                            GenericSignature genericSig,
-                                            LazyResolver *resolver) {
+                                            GenericSignature genericSig) {
   TypeResolution result(dc, TypeResolutionStage::Interface);
-  result.Resolver = resolver;
   result.complete.genericSig = genericSig;
   result.complete.builder = nullptr;
   return result;

lib/Sema/TypeCheckType.h

@@ -295,23 +295,19 @@ class TypeResolution {
   GenericSignatureBuilder *getGenericSignatureBuilder() const;
 
 public:
-  LazyResolver *Resolver = nullptr;
-  
   /// Form a type resolution for the structure of a type, which does not
   /// attempt to resolve member types of type parameters to a particular
   /// associated type.
   static TypeResolution forStructural(DeclContext *dc);
 
   /// Form a type resolution for an interface type, which is a complete
   /// description of the type using generic parameters.
-  static TypeResolution forInterface(DeclContext *dc,
-                                     LazyResolver *resolver = nullptr);
+  static TypeResolution forInterface(DeclContext *dc);
 
   /// Form a type resolution for an interface type, which is a complete
   /// description of the type using generic parameters.
   static TypeResolution forInterface(DeclContext *dc,
-                                     GenericSignature genericSig,
-                                     LazyResolver *resolver = nullptr);
+                                     GenericSignature genericSig);
 
   /// Form a type resolution for a contextual type, which is a complete
   /// description of the type using the archetypes of the given declaration