Drop ConstraintFix::diagfixBehavior() in favor of public const fixBehavior.

Author: DougGregor

include/swift/Sema/CSFix.h

@@ -411,10 +411,10 @@ class ConstraintFix {
   FixKind Kind;
   ConstraintLocator *Locator;
 
+public:
   /// The behavior limit to apply to the diagnostics emitted.
-  FixBehavior fixBehavior;
+  const FixBehavior fixBehavior;
 
-public:
   ConstraintFix(ConstraintSystem &cs, FixKind kind, ConstraintLocator *locator,
                 FixBehavior fixBehavior = FixBehavior::Error)
       : CS(cs), Kind(kind), Locator(locator), fixBehavior(fixBehavior) {}
@@ -445,10 +445,6 @@ class ConstraintFix {
   /// Determine the impact of this fix on the solution score, if any.
   Optional<ScoreKind> impact() const;
 
-  /// The diagnostic behavior limit that will be applied to any emitted
-  /// diagnostics.
-  FixBehavior diagfixBehavior() const { return fixBehavior; }
-
   virtual std::string getName() const = 0;
 
   /// Coalesce this fix with the given secondary fixes and diagnose the failure.

lib/Sema/CSFix.cpp

@@ -243,7 +243,7 @@ MarkExplicitlyEscaping::create(ConstraintSystem &cs, Type lhs, Type rhs,
 bool MarkGlobalActorFunction::diagnose(const Solution &solution,
                                        bool asNote) const {
   DroppedGlobalActorFunctionAttr failure(
-      solution, getFromType(), getToType(), getLocator(), diagfixBehavior());
+      solution, getFromType(), getToType(), getLocator(), fixBehavior);
   return failure.diagnose(asNote);
 }
 
@@ -263,7 +263,7 @@ bool AddSendableAttribute::diagnose(const Solution &solution,
                                       bool asNote) const {
   AttributedFuncToTypeConversionFailure failure(
       solution, getFromType(), getToType(), getLocator(),
-      AttributedFuncToTypeConversionFailure::Concurrent, diagfixBehavior());
+      AttributedFuncToTypeConversionFailure::Concurrent, fixBehavior);
   return failure.diagnose(asNote);
 }
 
@@ -1639,7 +1639,7 @@ bool TreatEphemeralAsNonEphemeral::diagnose(const Solution &solution,
                                             bool asNote) const {
   NonEphemeralConversionFailure failure(solution, getLocator(), getFromType(),
                                         getToType(), ConversionKind,
-                                        diagfixBehavior());
+                                        fixBehavior);
   return failure.diagnose(asNote);
 }
 
@@ -2233,7 +2233,7 @@ IgnoreDefaultExprTypeMismatch::create(ConstraintSystem &cs, Type argType,
 bool AddExplicitExistentialCoercion::diagnose(const Solution &solution,
                                               bool asNote) const {
   MissingExplicitExistentialCoercion failure(solution, ErasedResultType,
-                                             getLocator(), diagfixBehavior());
+                                             getLocator(), fixBehavior);
   return failure.diagnose(asNote);
 }