[NFC] Sema: Have 'validateTypedPattern' encapsulate TypeResolution construction

Author: AnthonyLatsis

lib/Sema/TypeCheckPattern.cpp

@@ -714,15 +714,19 @@ Pattern *TypeChecker::resolvePattern(Pattern *P, DeclContext *DC,
   return P;
 }
 
-static Type validateTypedPattern(TypedPattern *TP, TypeResolution resolution) {
+static Type
+validateTypedPattern(TypedPattern *TP, DeclContext *dc,
+                     TypeResolutionOptions options,
+                     OpenUnboundGenericTypeFn unboundTyOpener,
+                     HandlePlaceholderTypeReprFn placeholderHandler) {
   if (TP->hasType()) {
     return TP->getType();
   }
 
   // If the pattern declares an opaque type, and applies to a single
   // variable binding, then we can bind the opaque return type from the
   // property definition.
-  auto &Context = resolution.getASTContext();
+  auto &Context = dc->getASTContext();
   auto *Repr = TP->getTypeRepr();
   if (Repr && Repr->hasOpaque()) {
     auto named = dyn_cast<NamedPattern>(
@@ -747,7 +751,9 @@ static Type validateTypedPattern(TypedPattern *TP, TypeResolution resolution) {
     return named->getDecl()->getDeclContext()->mapTypeIntoContext(opaqueTy);
   }
 
-  auto ty = resolution.resolveType(Repr);
+  auto ty = TypeResolution::forContextual(dc, options, unboundTyOpener,
+                                          placeholderHandler)
+                .resolveType(Repr);
   if (ty->hasError()) {
     return ErrorType::get(Context);
   }
@@ -828,10 +834,8 @@ Type PatternTypeRequest::evaluate(Evaluator &evaluator,
       // For now, just return the placeholder type.
       placeholderHandler = PlaceholderType::get;
     }
-    return validateTypedPattern(
-        cast<TypedPattern>(P),
-        TypeResolution::forContextual(dc, options, unboundTyOpener,
-                                      placeholderHandler));
+    return validateTypedPattern(cast<TypedPattern>(P), dc, options,
+                                unboundTyOpener, placeholderHandler);
   }
 
   // A wildcard or name pattern cannot appear by itself in a context
@@ -896,11 +900,12 @@ Type PatternTypeRequest::evaluate(Evaluator &evaluator,
         // For now, just return the placeholder type.
         placeholderHandler = PlaceholderType::get;
       }
-      TypedPattern *TP = cast<TypedPattern>(somePat->getSubPattern());
-      const auto type = validateTypedPattern(
-          TP, TypeResolution::forContextual(dc, options, unboundTyOpener,
-                                            placeholderHandler));
-      if (type && !type->hasError()) {
+
+      const auto type =
+          validateTypedPattern(cast<TypedPattern>(somePat->getSubPattern()), dc,
+                               options, unboundTyOpener, placeholderHandler);
+
+      if (!type->hasError()) {
         return OptionalType::get(type);
       }
     }
@@ -1085,9 +1090,8 @@ Pattern *TypeChecker::coercePatternToType(ContextualPattern pattern,
           TP->setType(type);
           // If the pattern type has a placeholder, we need to resolve it here.
           if (patternType->hasPlaceholder()) {
-            validateTypedPattern(
-                cast<TypedPattern>(TP),
-                TypeResolution::forContextual(dc, options, nullptr, nullptr));
+            validateTypedPattern(cast<TypedPattern>(TP), dc, options, nullptr,
+                                 nullptr);
           }
         } else {
           diags.diagnose(P->getLoc(), diag::pattern_type_mismatch_context,