[CSFix] NFC: Rename fix/diagnostic for checked casts that always succeed

Author: xedin

include/swift/Sema/CSFix.h

@@ -309,9 +309,9 @@ enum class FixKind : uint8_t {
   /// know the result is always succeed.
   AllowCheckedCastCoercibleOptionalType,
 
-  /// Allow a runtime checked cast where we statically know the result
-  /// is always succeed.
-  AllowAlwaysSucceedCheckedCast,
+  /// Warn about runtime checked cast that is statically known to always
+  /// succeed.
+  AllowNoopCheckedCast,
 
   /// Allow a runtime checked cast where at compile time the from is
   /// convertible, but runtime does not support such convertions. e.g.
@@ -2681,23 +2681,26 @@ class AllowCheckedCastCoercibleOptionalType final
   }
 };
 
-class AllowAlwaysSucceedCheckedCast final
-    : public CheckedCastContextualMismatchWarning {
-  AllowAlwaysSucceedCheckedCast(ConstraintSystem &cs, Type fromType,
-                                Type toType, CheckedCastKind kind,
-                                ConstraintLocator *locator)
-      : CheckedCastContextualMismatchWarning(
-            cs, FixKind::AllowUnsupportedRuntimeCheckedCast, fromType, toType,
-            kind, locator) {}
+class AllowNoopCheckedCast final : public CheckedCastContextualMismatchWarning {
+  AllowNoopCheckedCast(ConstraintSystem &cs, Type fromType, Type toType,
+                       CheckedCastKind kind, ConstraintLocator *locator)
+      : CheckedCastContextualMismatchWarning(cs, FixKind::AllowNoopCheckedCast,
+                                             fromType, toType, kind, locator) {}
 
 public:
-  std::string getName() const override { return "checked cast always succeed"; }
+  std::string getName() const override {
+    return "checked cast always succeeds";
+  }
+
   bool diagnose(const Solution &solution, bool asNote = false) const override;
 
-  static AllowAlwaysSucceedCheckedCast *create(ConstraintSystem &cs,
-                                               Type fromType, Type toType,
-                                               CheckedCastKind kind,
-                                               ConstraintLocator *locator);
+  static AllowNoopCheckedCast *create(ConstraintSystem &cs, Type fromType,
+                                      Type toType, CheckedCastKind kind,
+                                      ConstraintLocator *locator);
+
+  static bool classof(ConstraintFix *fix) {
+    return fix->getKind() == FixKind::AllowNoopCheckedCast;
+  }
 };
 
 class AllowUnsupportedRuntimeCheckedCast final
@@ -2721,6 +2724,10 @@ class AllowUnsupportedRuntimeCheckedCast final
   static AllowUnsupportedRuntimeCheckedCast *
   attempt(ConstraintSystem &cs, Type fromType, Type toType,
           CheckedCastKind kind, ConstraintLocator *locator);
+
+  static bool classof(ConstraintFix *fix) {
+    return fix->getKind() == FixKind::AllowUnsupportedRuntimeCheckedCast;
+  }
 };
 
 class AllowInvalidStaticMemberRefOnProtocolMetatype final

lib/Sema/CSDiagnostics.cpp

@@ -7698,7 +7698,7 @@ bool CoercibleOptionalCheckedCastFailure::diagnoseConditionalCastExpr() const {
   return true;
 }
 
-bool AlwaysSucceedCheckedCastFailure::diagnoseIfExpr() const {
+bool NoopCheckedCast::diagnoseIfExpr() const {
   auto *expr = getAsExpr<IsExpr>(CastExpr);
   if (!expr)
     return false;
@@ -7707,7 +7707,7 @@ bool AlwaysSucceedCheckedCastFailure::diagnoseIfExpr() const {
   return true;
 }
 
-bool AlwaysSucceedCheckedCastFailure::diagnoseConditionalCastExpr() const {
+bool NoopCheckedCast::diagnoseConditionalCastExpr() const {
   auto *expr = getAsExpr<ConditionalCheckedCastExpr>(CastExpr);
   if (!expr)
     return false;
@@ -7717,7 +7717,7 @@ bool AlwaysSucceedCheckedCastFailure::diagnoseConditionalCastExpr() const {
   return true;
 }
 
-bool AlwaysSucceedCheckedCastFailure::diagnoseForcedCastExpr() const {
+bool NoopCheckedCast::diagnoseForcedCastExpr() const {
   auto *expr = getAsExpr<ForcedCheckedCastExpr>(CastExpr);
   if (!expr)
     return false;
@@ -7742,7 +7742,7 @@ bool AlwaysSucceedCheckedCastFailure::diagnoseForcedCastExpr() const {
   return true;
 }
 
-bool AlwaysSucceedCheckedCastFailure::diagnoseAsError() {
+bool NoopCheckedCast::diagnoseAsError() {
   if (diagnoseIfExpr())
     return true;
 

lib/Sema/CSDiagnostics.h

@@ -2537,11 +2537,10 @@ class CoercibleOptionalCheckedCastFailure final
 
 /// Warn situations where the compiler can statically know a runtime
 /// checked cast always succeed.
-class AlwaysSucceedCheckedCastFailure final : public CheckedCastBaseFailure {
+class NoopCheckedCast final : public CheckedCastBaseFailure {
 public:
-  AlwaysSucceedCheckedCastFailure(const Solution &solution, Type fromType,
-                                  Type toType, CheckedCastKind kind,
-                                  ConstraintLocator *locator)
+  NoopCheckedCast(const Solution &solution, Type fromType, Type toType,
+                  CheckedCastKind kind, ConstraintLocator *locator)
       : CheckedCastBaseFailure(solution, fromType, toType, kind, locator) {}
 
   bool diagnoseAsError() override;

lib/Sema/CSFix.cpp

@@ -1920,19 +1920,19 @@ bool AllowCheckedCastCoercibleOptionalType::diagnose(const Solution &solution,
   return failure.diagnose(asNote);
 }
 
-AllowAlwaysSucceedCheckedCast *
-AllowAlwaysSucceedCheckedCast::create(ConstraintSystem &cs, Type fromType,
-                                      Type toType, CheckedCastKind kind,
-                                      ConstraintLocator *locator) {
+AllowNoopCheckedCast *AllowNoopCheckedCast::create(ConstraintSystem &cs,
+                                                   Type fromType, Type toType,
+                                                   CheckedCastKind kind,
+                                                   ConstraintLocator *locator) {
   return new (cs.getAllocator())
-      AllowAlwaysSucceedCheckedCast(cs, fromType, toType, kind, locator);
+      AllowNoopCheckedCast(cs, fromType, toType, kind, locator);
 }
 
-bool AllowAlwaysSucceedCheckedCast::diagnose(const Solution &solution,
-                                             bool asNote) const {
-  AlwaysSucceedCheckedCastFailure failure(solution, getFromType(), getToType(),
-                                          CastKind, getLocator());
-  return failure.diagnose(asNote);
+bool AllowNoopCheckedCast::diagnose(const Solution &solution,
+                                    bool asNote) const {
+  NoopCheckedCast warning(solution, getFromType(), getToType(), CastKind,
+                          getLocator());
+  return warning.diagnose(asNote);
 }
 
 // Although function types maybe compile-time convertible because

lib/Sema/CSSimplify.cpp

@@ -6678,9 +6678,9 @@ static ConstraintFix *maybeWarnAboutExtraneousCast(
 
   // Always succeed
   if (isCastToExpressibleByNilLiteral(cs, origFromType, toType)) {
-    return AllowAlwaysSucceedCheckedCast::create(
-        cs, fromType, toType, CheckedCastKind::Coercion,
-        cs.getConstraintLocator(locator));
+    return AllowNoopCheckedCast::create(cs, fromType, toType,
+                                        CheckedCastKind::Coercion,
+                                        cs.getConstraintLocator(locator));
   }
 
   // If both original are metatypes we have to use them because most of the
@@ -6715,10 +6715,9 @@ static ConstraintFix *maybeWarnAboutExtraneousCast(
         cs, origFromType, origToType, castKind,
         cs.getConstraintLocator(locator));
   } else {
-    // No optionals, just a trivial cast that always succeed.
-    return AllowAlwaysSucceedCheckedCast::create(
-        cs, origFromType, origToType, castKind,
-        cs.getConstraintLocator(locator));
+    // No optionals, just a trivial cast that always succeeds.
+    return AllowNoopCheckedCast::create(cs, origFromType, origToType, castKind,
+                                        cs.getConstraintLocator(locator));
   }
 }
 
@@ -11558,8 +11557,8 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyFixConstraint(
   case FixKind::AllowRefToInvalidDecl:
   case FixKind::SpecifyBaseTypeForOptionalUnresolvedMember:
   case FixKind::AllowCheckedCastCoercibleOptionalType:
+  case FixKind::AllowNoopCheckedCast:
   case FixKind::AllowUnsupportedRuntimeCheckedCast:
-  case FixKind::AllowAlwaysSucceedCheckedCast:
   case FixKind::AllowInvalidStaticMemberRefOnProtocolMetatype:
   case FixKind::AllowWrappedValueMismatch:
   case FixKind::RemoveExtraneousArguments: