[CSFix] Add a specific kind for IgnoreResultBuilderWithReturnStmts

Author: xedin

include/swift/Sema/CSFix.h

@@ -290,6 +290,9 @@ enum class FixKind : uint8_t {
   /// Ignore result builder body which fails `pre-check` call.
   IgnoreInvalidResultBuilderBody,
 
+  /// Ignore result builder body if it has `return` statements.
+  IgnoreResultBuilderWithReturnStmts,
+
   /// Resolve type of `nil` by providing a contextual type.
   SpecifyContextualTypeForNil,
 
@@ -2503,10 +2506,15 @@ class AllowKeyPathWithoutComponents final : public ConstraintFix {
 };
 
 class IgnoreInvalidResultBuilderBody : public ConstraintFix {
-protected:
   IgnoreInvalidResultBuilderBody(ConstraintSystem &cs,
                                  ConstraintLocator *locator)
-      : ConstraintFix(cs, FixKind::IgnoreInvalidResultBuilderBody, locator) {}
+      : IgnoreInvalidResultBuilderBody(
+            cs, FixKind::IgnoreInvalidResultBuilderBody, locator) {}
+
+protected:
+  IgnoreInvalidResultBuilderBody(ConstraintSystem &cs, FixKind kind,
+                                 ConstraintLocator *locator)
+      : ConstraintFix(cs, kind, locator) {}
 
 public:
   std::string getName() const override {
@@ -2533,13 +2541,19 @@ class IgnoreResultBuilderWithReturnStmts final
 
   IgnoreResultBuilderWithReturnStmts(ConstraintSystem &cs, Type builderTy,
                                      ConstraintLocator *locator)
-      : IgnoreInvalidResultBuilderBody(cs, locator), BuilderType(builderTy) {}
+      : IgnoreInvalidResultBuilderBody(
+            cs, FixKind::IgnoreResultBuilderWithReturnStmts, locator),
+        BuilderType(builderTy) {}
 
 public:
   bool diagnose(const Solution &solution, bool asNote = false) const override;
 
   static IgnoreResultBuilderWithReturnStmts *
   create(ConstraintSystem &cs, Type builderTy, ConstraintLocator *locator);
+
+  static bool classof(ConstraintFix *fix) {
+    return fix->getKind() == FixKind::IgnoreResultBuilderWithReturnStmts;
+  }
 };
 
 class SpecifyContextualTypeForNil final : public ConstraintFix {

lib/Sema/CSBindings.cpp

@@ -1871,8 +1871,9 @@ TypeVariableBinding::fixForHole(ConstraintSystem &cs) const {
     // If the whole body is being ignored due to a pre-check failure,
     // let's not record a fix about result type since there is
     // just not enough context to infer it without a body.
-    if (cs.hasFixFor(cs.getConstraintLocator(closure),
-                     FixKind::IgnoreInvalidResultBuilderBody))
+    auto *closureLoc = cs.getConstraintLocator(closure);
+    if (cs.hasFixFor(closureLoc, FixKind::IgnoreInvalidResultBuilderBody) ||
+        cs.hasFixFor(closureLoc, FixKind::IgnoreResultBuilderWithReturnStmts))
       return None;
 
     ConstraintFix *fix = SpecifyClosureReturnType::create(cs, dstLocator);

lib/Sema/CSSimplify.cpp

@@ -11553,6 +11553,7 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyFixConstraint(
   case FixKind::SpecifyLabelToAssociateTrailingClosure:
   case FixKind::AllowKeyPathWithoutComponents:
   case FixKind::IgnoreInvalidResultBuilderBody:
+  case FixKind::IgnoreResultBuilderWithReturnStmts:
   case FixKind::SpecifyContextualTypeForNil:
   case FixKind::AllowRefToInvalidDecl:
   case FixKind::SpecifyBaseTypeForOptionalUnresolvedMember: