[CSFix] Add a specific kind for AllowAutoClosurePointerConversion

Author: xedin

include/swift/Sema/CSFix.h

@@ -347,6 +347,10 @@ enum class FixKind : uint8_t {
   /// Fix conversion from async to sync function by removing explicit
   /// `async` attribute from the source function.
   DropAsyncAttribute,
+
+  /// Allow invalid pointer conversions for autoclosure result types as if the
+  /// pointer type is a function parameter rather than an autoclosure result.
+  AllowAutoClosurePointerConversion,
 };
 
 class ConstraintFix {
@@ -982,12 +986,12 @@ class AutoClosureForwarding final : public ConstraintFix {
   }
 };
 
-/// Allow invalid pointer conversions for autoclosure result types as if the
-/// pointer type is a function parameter rather than an autoclosure result.
 class AllowAutoClosurePointerConversion final : public ContextualMismatch {
   AllowAutoClosurePointerConversion(ConstraintSystem &cs, Type pointeeType,
-                                    Type pointerType, ConstraintLocator *locator)
-      : ContextualMismatch(cs, pointeeType, pointerType, locator) {}
+                                    Type pointerType,
+                                    ConstraintLocator *locator)
+      : ContextualMismatch(cs, FixKind::AllowAutoClosurePointerConversion,
+                           pointeeType, pointerType, locator) {}
 
 public:
   std::string getName() const override {
@@ -1000,6 +1004,10 @@ class AllowAutoClosurePointerConversion final : public ContextualMismatch {
                                                    Type pointeeType,
                                                    Type pointerType,
                                                    ConstraintLocator *locator);
+
+  static bool classof(ConstraintFix *fix) {
+    return fix->getKind() == FixKind::AllowAutoClosurePointerConversion;
+  }
 };
 
 class RemoveUnwrap final : public ConstraintFix {

lib/Sema/CSSimplify.cpp

@@ -11563,7 +11563,8 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyFixConstraint(
   case FixKind::AllowInvalidStaticMemberRefOnProtocolMetatype:
   case FixKind::AllowWrappedValueMismatch:
   case FixKind::RemoveExtraneousArguments:
-  case FixKind::SpecifyTypeForPlaceholder: {
+  case FixKind::SpecifyTypeForPlaceholder:
+  case FixKind::AllowAutoClosurePointerConversion: {
     return recordFix(fix) ? SolutionKind::Error : SolutionKind::Solved;
   }