reword "boundary use" to just "non-consuming"

Author: kavon

include/swift/AST/DiagnosticsSIL.def

@@ -779,8 +779,6 @@ ERROR(sil_moveonlychecker_cannot_destructure_has_deinit, none,
 
 NOTE(sil_moveonlychecker_partial_consume_here, none,
      "partial consume here", ())
-NOTE(sil_moveonlychecker_boundary_use, none,
-     "boundary use here", ())
 NOTE(sil_moveonlychecker_consuming_use_here, none,
      "consuming use here", ())
 NOTE(sil_moveonlychecker_other_consuming_use_here, none,
@@ -791,8 +789,14 @@ NOTE(sil_moveonlychecker_consuming_and_non_consuming_uses_here, none,
      "consuming and non-consuming uses here", ())
 NOTE(sil_moveonlychecker_consuming_closure_use_here, none,
      "closure capture here", ())
+
+// TODO: a lot of these "non-consuming use" notes are just emitted to point out
+// an "invalid use after consume". I'd say most of them are for that.
+// In the other narrow cases where that's not quite right, we could go with
+// something vague like "use here"
 NOTE(sil_moveonlychecker_nonconsuming_use_here, none,
      "non-consuming use here", ())
+
 NOTE(sil_movekillscopyablevalue_value_cyclic_consumed_in_loop_here, none,
      "consuming in loop use here", ())
 NOTE(sil_moveonlychecker_deinit_here, none,

lib/SILOptimizer/Mandatory/MoveOnlyDiagnostics.cpp

@@ -563,7 +563,7 @@ void DiagnosticEmitter::emitObjectDestructureNeededWithinBorrowBoundary(
                      [&](unsigned index) { return pair.second.test(index); })) {
       LLVM_DEBUG(llvm::dbgs()
                  << "    Destructure Boundary Use: " << *pair.first);
-      diagnose(astContext, pair.first, diag::sil_moveonlychecker_boundary_use);
+      diagnose(astContext, pair.first, diag::sil_moveonlychecker_nonconsuming_use_here);
     }
   }
   registerDiagnosticEmitted(markedValue);

test/SILOptimizer/moveonly_borrow_to_destructure_transform_diagnostics.sil

@@ -78,7 +78,7 @@ bb0(%0 : @guaranteed $AggStruct2):
   destroy_value %2 : $AggStruct2
   %9 = function_ref @moveonlyklass_consume : $@convention(thin) (@owned MoveOnlyKlass) -> ()
   apply %9(%7) : $@convention(thin) (@owned MoveOnlyKlass) -> () // expected-note {{partial consume here}}
-  apply %9(%7a) : $@convention(thin) (@owned MoveOnlyKlass) -> () // expected-note {{boundary use here}}
+  apply %9(%7a) : $@convention(thin) (@owned MoveOnlyKlass) -> () // expected-note {{non-consuming use here}}
   %9999 = tuple()
   return %9999 : $()
 }

test/SILOptimizer/moveonly_objectchecker_diagnostics.swift

@@ -4184,7 +4184,7 @@ func testStructContainingEmptyStruct() {
   func testGuaranteedArg7a(_ x: borrowing StructContainingEmptyStruct) {
     // expected-error @-1 {{cannot use 'x' after partial consume}}
     x.x.doSomething3() // expected-note {{partial consume here}}
-    x.x.doSomething3() // expected-note {{boundary use here}}
+    x.x.doSomething3() // expected-note {{non-consuming use here}}
   }
 }