merge similar diagnostics together under a unified naming scheme for more consistent word tense

sil_movekillscopyablevalue_* and sil_moveonlychecker_* can share diagnostics.

rdar://109281444
(cherry picked from commit 71763a1)

Author: kavon

include/swift/AST/DiagnosticsSIL.def

@@ -747,77 +747,65 @@ NOTE(discard_nontrivial_implicit_storage_note,none,
      "type %0 implicitly contains %1 which cannot be trivially destroyed",
      (Type, Type))
 
-// move only checker diagnostics
-ERROR(sil_moveonlychecker_owned_value_consumed_more_than_once, none,
+
+/// Move Checking / Noncopyable types diagnostics
+
+ERROR(sil_movechecking_owned_value_consumed_more_than_once, none,
       "'%0' consumed more than once", (StringRef))
-ERROR(sil_moveonlychecker_owned_value_consumed_and_used_at_same_time, none,
+ERROR(sil_movechecking_owned_value_consumed_and_used_at_same_time, none,
       "'%0' consumed and used at the same time", (StringRef))
-ERROR(sil_moveonlychecker_value_used_after_consume, none,
+ERROR(sil_movechecking_value_used_after_consume, none,
       "'%0' used after consume", (StringRef))
-ERROR(sil_moveonlychecker_guaranteed_value_consumed, none,
+ERROR(sil_movechecking_guaranteed_value_consumed, none,
       "'%0' is borrowed and cannot be consumed", (StringRef))
 
 // FIXME: this diagnostic shouldn't ever be emitted now. rdar://109742587 (closures may still try to consume captures, e.g., borrowed parameters)
-ERROR(sil_moveonlychecker_guaranteed_value_captured_by_closure, none,
+ERROR(sil_movechecking_guaranteed_value_captured_by_closure, none,
       "'%0' is borrowed and cannot be consumed by closure capture", (StringRef))
 
-ERROR(sil_moveonlychecker_capture_consumed, none,
+ERROR(sil_movechecking_capture_consumed, none,
       "noncopyable '%0' cannot be consumed when captured by a closure", (StringRef))
-ERROR(sil_moveonlychecker_inout_not_reinitialized_before_end_of_function, none,
+ERROR(sil_movechecking_inout_not_reinitialized_before_end_of_function, none,
       "missing reinitialization of inout parameter '%0' after consume", (StringRef))
-ERROR(sil_moveonlychecker_value_consumed_in_a_loop, none,
+ERROR(sil_movechecking_value_consumed_in_a_loop, none,
       "'%0' consumed in a loop", (StringRef))
-
-ERROR(sil_moveonlychecker_use_after_partial_consume, none,
+ERROR(sil_movechecking_use_after_partial_consume, none,
       "cannot use '%0' after partial consume", (StringRef))
-
-ERROR(sil_moveonlychecker_notconsumable_but_assignable_was_consumed, none,
+ERROR(sil_movechecking_notconsumable_but_assignable_was_consumed, none,
       "cannot consume noncopyable stored property '%0' %select{of a class|that is global}1",
       (StringRef, bool))
-
-ERROR(sil_moveonlychecker_cannot_destructure_has_deinit, none,
+ERROR(sil_movechecking_cannot_destructure_has_deinit, none,
       "cannot partially consume '%0' when it has a deinitializer",
       (StringRef))
 
-NOTE(sil_moveonlychecker_partial_consume_here, none,
+NOTE(sil_movechecking_partial_consume_here, none,
      "partially consumed here", ())
-NOTE(sil_moveonlychecker_consuming_use_here, none,
+NOTE(sil_movechecking_consuming_use_here, none,
      "consumed here", ())
-NOTE(sil_moveonlychecker_other_consuming_use_here, none,
+NOTE(sil_movechecking_other_consuming_use_here, none,
      "other consume here", ())
-NOTE(sil_moveonlychecker_two_consuming_uses_here, none,
+NOTE(sil_movechecking_two_consuming_uses_here, none,
      "multiple consumes here", ())
-NOTE(sil_moveonlychecker_consuming_and_non_consuming_uses_here, none,
+NOTE(sil_movechecking_consuming_and_non_consuming_uses_here, none,
      "consumed and used here", ())
-NOTE(sil_moveonlychecker_consuming_closure_use_here, none,
+NOTE(sil_movechecking_consuming_closure_use_here, none,
      "closure capturing '%0' here", (StringRef))
-NOTE(sil_moveonlychecker_nonconsuming_use_here, none,
+NOTE(sil_movechecking_nonconsuming_use_here, none,
      "used here", ())
-
-NOTE(sil_movekillscopyablevalue_value_cyclic_consumed_in_loop_here, none,
-     "consuming in loop use here", ())
-NOTE(sil_moveonlychecker_deinit_here, none,
-     "deinit declared here", ())
-
-// move kills copyable values checker diagnostics
-ERROR(sil_movekillscopyablevalue_value_consumed_more_than_once, none,
-      "'%0' used after being consumed", (StringRef))
-NOTE(sil_movekillscopyablevalue_move_here, none,
-     "consume here", ())
-NOTE(sil_movekillscopyablevalue_use_here, none,
-     "use here", ())
-NOTE(sil_movekillscopyablevalue_value_consumed_in_loop, none,
-     "consume here would occur multiple times in loop", ())
+NOTE(sil_movechecking_consumed_in_loop_here, none,
+     "consumed in loop here", ())
+NOTE(sil_movechecking_deinit_here, none,
+     "deinitializer declared here", ())
 
 // errors involving noncopyables that are considered to be bugs in the compiler
-ERROR(sil_moveonlychecker_not_understand_consumable_and_assignable, none,
+ERROR(sil_movechecking_not_understand_consumable_and_assignable, none,
       "usage of no-implicit-copy value that the compiler can't verify. This is a compiler bug. Please file a bug with a small example of the bug", ())
-ERROR(sil_moveonlychecker_not_understand_moveonly, none,
+ERROR(sil_movechecking_not_understand_moveonly, none,
       "usage of a noncopyable type that compiler can't verify. This is a compiler bug. Please file a bug with a small example of the bug"
       "check!", ())
-ERROR(sil_moveonlychecker_bug_missed_copy, none,
+ERROR(sil_movechecking_bug_missed_copy, none,
       "copy of noncopyable typed value. This is a compiler bug. Please file a bug with a small example of the bug", ())
-ERROR(sil_moveonlychecker_bug_exclusivity_violation, none,
+ERROR(sil_movechecking_bug_exclusivity_violation, none,
       "'%0' has an unexpected exclusivity violation. This is a compiler bug. Please file a bug with a small example of the bug", (StringRef))
 ERROR(sil_movekillscopyablevalue_move_applied_to_unsupported_move, none,
       "'consume' applied to value that the compiler does not support. This is a compiler bug. Please file a bug with a small example of the bug",

lib/SILOptimizer/Mandatory/ConsumeOperatorCopyableAddressesChecker.cpp

@@ -1655,18 +1655,18 @@ bool DataflowState::process(
         auto &astContext = fn->getASTContext();
         {
           auto diag =
-              diag::sil_movekillscopyablevalue_value_consumed_more_than_once;
+              diag::sil_movechecking_value_used_after_consume;
           StringRef name = getDebugVarName(address);
           diagnose(astContext, getSourceLocFromValue(address), diag, name);
         }
 
         {
-          auto diag = diag::sil_movekillscopyablevalue_move_here;
+          auto diag = diag::sil_movechecking_consuming_use_here;
           diagnose(astContext, mvi->getLoc().getSourceLoc(), diag);
         }
 
         {
-          auto diag = diag::sil_movekillscopyablevalue_use_here;
+          auto diag = diag::sil_movechecking_nonconsuming_use_here;
           diagnose(astContext, iter->second->getLoc().getSourceLoc(), diag);
         }
 
@@ -1685,18 +1685,18 @@ bool DataflowState::process(
           auto &astContext = fn->getASTContext();
           {
             auto diag =
-                diag::sil_movekillscopyablevalue_value_consumed_more_than_once;
+                diag::sil_movechecking_value_used_after_consume;
             StringRef name = getDebugVarName(address);
             diagnose(astContext, getSourceLocFromValue(address), diag, name);
           }
 
           {
-            auto diag = diag::sil_movekillscopyablevalue_move_here;
+            auto diag = diag::sil_movechecking_consuming_use_here;
             diagnose(astContext, mvi->getLoc().getSourceLoc(), diag);
           }
 
           {
-            auto diag = diag::sil_movekillscopyablevalue_use_here;
+            auto diag = diag::sil_movechecking_nonconsuming_use_here;
             for (auto *user : iter->second->pairedUseInsts) {
               diagnose(astContext, user->getLoc().getSourceLoc(), diag);
             }
@@ -2114,16 +2114,16 @@ bool ConsumeOperatorCopyableAddressesChecker::performSingleBasicBlockAnalysis(
     auto &astCtx = mvi->getFunction()->getASTContext();
     {
       auto diag =
-          diag::sil_movekillscopyablevalue_value_consumed_more_than_once;
+          diag::sil_movechecking_value_used_after_consume;
       StringRef name = getDebugVarName(address);
       diagnose(astCtx, getSourceLocFromValue(address), diag, name);
     }
 
-    auto diag = diag::sil_movekillscopyablevalue_move_here;
+    auto diag = diag::sil_movechecking_consuming_use_here;
     diagnose(astCtx, mvi->getLoc().getSourceLoc(), diag);
 
     {
-      auto diag = diag::sil_movekillscopyablevalue_use_here;
+      auto diag = diag::sil_movechecking_nonconsuming_use_here;
       for (auto *user : interestingClosureUsers) {
         diagnose(astCtx, user->getLoc().getSourceLoc(), diag);
       }
@@ -2155,18 +2155,18 @@ bool ConsumeOperatorCopyableAddressesChecker::performSingleBasicBlockAnalysis(
     auto &astCtx = mvi->getFunction()->getASTContext();
     {
       auto diag =
-          diag::sil_movekillscopyablevalue_value_consumed_more_than_once;
+          diag::sil_movechecking_value_used_after_consume;
       StringRef name = getDebugVarName(address);
       diagnose(astCtx, getSourceLocFromValue(address), diag, name);
     }
 
     {
-      auto diag = diag::sil_movekillscopyablevalue_move_here;
+      auto diag = diag::sil_movechecking_consuming_use_here;
       diagnose(astCtx, mvi->getLoc().getSourceLoc(), diag);
     }
 
     {
-      auto diag = diag::sil_movekillscopyablevalue_use_here;
+      auto diag = diag::sil_movechecking_nonconsuming_use_here;
       diagnose(astCtx, interestingUser->getLoc().getSourceLoc(), diag);
     }
 

lib/SILOptimizer/Mandatory/ConsumeOperatorCopyableValuesChecker.cpp

@@ -248,10 +248,10 @@ void ConsumeOperatorCopyableValuesChecker::emitDiagnosticForMove(
 
   // First we emit the main error and then the note on where the move was.
   diagnose(astContext, getSourceLocFromValue(borrowedValue),
-           diag::sil_movekillscopyablevalue_value_consumed_more_than_once,
+           diag::sil_movechecking_value_used_after_consume,
            borrowedValueName);
   diagnose(astContext, mvi->getLoc().getSourceLoc(),
-           diag::sil_movekillscopyablevalue_move_here);
+           diag::sil_movechecking_consuming_use_here);
 
   // Then we do a bit of work to figure out where /all/ of the later uses than
   // mvi are so we can emit notes to the user telling them this is a problem
@@ -282,7 +282,7 @@ void ConsumeOperatorCopyableValuesChecker::emitDiagnosticForMove(
       case PrunedLiveness::LifetimeEndingUse:
         LLVM_DEBUG(llvm::dbgs() << "Emitting note for in block use: " << inst);
         diagnose(astContext, inst.getLoc().getSourceLoc(),
-                 diag::sil_movekillscopyablevalue_use_here);
+                 diag::sil_movechecking_nonconsuming_use_here);
         break;
       }
     }
@@ -341,7 +341,7 @@ void ConsumeOperatorCopyableValuesChecker::emitDiagnosticForMove(
           LLVM_DEBUG(llvm::dbgs()
                      << "(3) Emitting diagnostic for user: " << inst);
           diagnose(astContext, inst.getLoc().getSourceLoc(),
-                   diag::sil_movekillscopyablevalue_use_here);
+                   diag::sil_movechecking_nonconsuming_use_here);
           break;
         }
       }
@@ -367,7 +367,7 @@ void ConsumeOperatorCopyableValuesChecker::emitDiagnosticForMove(
         LLVM_DEBUG(llvm::dbgs()
                    << "(1) Emitting diagnostic for user: " << inst);
         diagnose(astContext, inst.getLoc().getSourceLoc(),
-                 diag::sil_movekillscopyablevalue_use_here);
+                 diag::sil_movechecking_nonconsuming_use_here);
         continue;
       }
 
@@ -378,7 +378,7 @@ void ConsumeOperatorCopyableValuesChecker::emitDiagnosticForMove(
           // carry dataflow violation.
           if (mvi == &inst) {
             diagnose(astContext, inst.getLoc().getSourceLoc(),
-                     diag::sil_movekillscopyablevalue_value_consumed_in_loop);
+                     diag::sil_movechecking_consumed_in_loop_here);
             continue;
           }
           // We ignore consuming uses that are destroy_value since in our model
@@ -389,7 +389,7 @@ void ConsumeOperatorCopyableValuesChecker::emitDiagnosticForMove(
           LLVM_DEBUG(llvm::dbgs()
                      << "(2) Emitting diagnostic for user: " << inst);
           diagnose(astContext, inst.getLoc().getSourceLoc(),
-                   diag::sil_movekillscopyablevalue_use_here);
+                   diag::sil_movechecking_nonconsuming_use_here);
         }
       }
     }