[move-only] QoI: Fix up error notes from "{non,}consuming use" -> "{non,}consuming use here".

rdar://104926091

Author: gottesmm

include/swift/AST/DiagnosticsSIL.def

@@ -753,15 +753,15 @@ NOTE(sil_moveonlychecker_moveonly_field_consumed_here, none,
 NOTE(sil_moveonlychecker_boundary_use, none,
      "boundary use here", ())
 NOTE(sil_moveonlychecker_consuming_use_here, none,
-     "consuming use", ())
+     "consuming use here", ())
 NOTE(sil_moveonlychecker_two_consuming_uses_here, none,
      "two consuming uses here", ())
 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", ())
+     "closure capture here", ())
 NOTE(sil_moveonlychecker_nonconsuming_use_here, none,
-     "non-consuming use", ())
+     "non-consuming use here", ())
 ERROR(sil_moveonlychecker_not_understand_no_implicit_copy, none,
       "Usage of @noImplicitCopy that the move checker does not know how to "
       "check!", ())

test/SILOptimizer/moveonly_addresschecker_diagnostics.sil

@@ -82,7 +82,7 @@ bb0(%0 : $Int):
   end_access %8 : $*AggStruct
   %12 = begin_access [read] [static] %3 : $*AggStruct
   %13 = struct_element_addr %12 : $*AggStruct, #AggStruct.lhs
-  %14 = load [copy] %13 : $*Klass // expected-note {{consuming use}}
+  %14 = load [copy] %13 : $*Klass // expected-note {{consuming use here}}
   end_access %12 : $*AggStruct
   %16 = move_value [lexical] %14 : $Klass
   %17 = mark_must_check [no_implicit_copy] %16 : $Klass
@@ -91,7 +91,7 @@ bb0(%0 : $Int):
   %20 = move_value %19 : $Klass
   destroy_value %20 : $Klass
   destroy_value %17 : $Klass
-  %23 = load [copy] %3 : $*AggStruct // expected-note {{consuming use}}
+  %23 = load [copy] %3 : $*AggStruct // expected-note {{consuming use here}}
   destroy_addr %3 : $*AggStruct
   dealloc_stack %2 : $*AggStruct
   return %23 : $AggStruct
@@ -109,7 +109,7 @@ bb0(%arg : @owned $AggStruct):
   %12 = begin_access [read] [static] %1 : $*AggStruct
   %13 = struct_element_addr %12 : $*AggStruct, #AggStruct.pair
   %14 = struct_element_addr %13 : $*KlassPair, #KlassPair.lhs
-  %15 = load [copy] %14 : $*Klass // expected-note {{consuming use}}
+  %15 = load [copy] %14 : $*Klass // expected-note {{consuming use here}}
   end_access %12 : $*AggStruct
   %17 = function_ref @classConsume : $@convention(thin) (@owned Klass) -> ()
   %18 = apply %17(%15) : $@convention(thin) (@owned Klass) -> ()
@@ -123,8 +123,8 @@ bb2(%55 : $Int):
   %57 = struct_element_addr %56 : $*AggStruct, #AggStruct.pair
   %58 = struct_element_addr %57 : $*KlassPair, #KlassPair.lhs
   %59 = load [copy] %58 : $*Klass
-  // expected-note @-1 {{consuming use}}
-  // expected-note @-2 {{consuming use}}  
+  // expected-note @-1 {{consuming use here}}
+  // expected-note @-2 {{consuming use here}}  
   end_access %56 : $*AggStruct
   %61 = function_ref @classConsume : $@convention(thin) (@owned Klass) -> ()
   %62 = apply %61(%59) : $@convention(thin) (@owned Klass) -> ()
@@ -187,13 +187,13 @@ bb0(%arg : @owned $NonTrivialStruct, %arg1 : @owned $NonTrivialStruct):
   end_access %12 : $*NonTrivialStruct
   %19 = begin_access [read] [static] %1 : $*NonTrivialStruct
   %20 = struct_element_addr %19 : $*NonTrivialStruct, #NonTrivialStruct.k
-  %21 = load [copy] %20 : $*Klass // expected-note {{consuming use}}
+  %21 = load [copy] %20 : $*Klass // expected-note {{consuming use here}}
   end_access %19 : $*NonTrivialStruct
   %23 = function_ref @classConsume : $@convention(thin) (@owned Klass) -> ()
   %24 = apply %23(%21) : $@convention(thin) (@owned Klass) -> ()
   %25 = begin_access [read] [static] %1 : $*NonTrivialStruct
   %26 = struct_element_addr %25 : $*NonTrivialStruct, #NonTrivialStruct.k
-  %27 = load [copy] %26 : $*Klass // expected-note {{consuming use}}
+  %27 = load [copy] %26 : $*Klass // expected-note {{consuming use here}}
   end_access %25 : $*NonTrivialStruct
   %29 = function_ref @classConsume : $@convention(thin) (@owned Klass) -> ()
   %30 = apply %29(%27) : $@convention(thin) (@owned Klass) -> ()

test/SILOptimizer/moveonly_addresschecker_diagnostics.swift

@@ -77,7 +77,7 @@ bb0(%0 : @guaranteed $AggStruct2):
   end_borrow %4a : $AggStruct2
   destroy_value %2 : $AggStruct2
   %9 = function_ref @moveonlyklass_consume : $@convention(thin) (@owned MoveOnlyKlass) -> ()
-  apply %9(%7) : $@convention(thin) (@owned MoveOnlyKlass) -> () // expected-note {{consuming use}}
+  apply %9(%7) : $@convention(thin) (@owned MoveOnlyKlass) -> () // expected-note {{consuming use here}}
   apply %9(%7a) : $@convention(thin) (@owned MoveOnlyKlass) -> () // expected-note {{boundary use here}}
   %9999 = tuple()
   return %9999 : $()
@@ -141,7 +141,7 @@ bb0(%0 : @owned $AggStruct2):
   %9 = struct_extract %8 : $AggStruct2, #AggStruct2.lhs
   %10 = copy_value %9 : $MoveOnlyKlass
   %11 = function_ref @moveonlyklass_consume : $@convention(thin) (@owned MoveOnlyKlass) -> ()
-  %12 = apply %11(%10) : $@convention(thin) (@owned MoveOnlyKlass) -> () // expected-note {{consuming use}}
+  %12 = apply %11(%10) : $@convention(thin) (@owned MoveOnlyKlass) -> () // expected-note {{consuming use here}}
   end_borrow %8 : $AggStruct2
   br bb1
 
@@ -153,7 +153,7 @@ bb2:
   %52 = struct_extract %51 : $AggStruct2, #AggStruct2.lhs
   %53 = copy_value %52 : $MoveOnlyKlass
   %54 = function_ref @moveonlyklass_consume : $@convention(thin) (@owned MoveOnlyKlass) -> ()
-  %55 = apply %54(%53) : $@convention(thin) (@owned MoveOnlyKlass) -> () // expected-note {{consuming use}}
+  %55 = apply %54(%53) : $@convention(thin) (@owned MoveOnlyKlass) -> () // expected-note {{consuming use here}}
   end_borrow %51 : $AggStruct2
   br bb1
 

test/SILOptimizer/moveonly_borrow_to_destructure_transform_diagnostics.sil

@@ -10,18 +10,18 @@ struct MoveOnlyStruct {
     var k = Klass()
 
     deinit { // expected-error {{'self' consumed more than once}}
-        let x = self // expected-note {{consuming use}}
+        let x = self // expected-note {{consuming use here}}
         _ = x
         var y = MoveOnlyStruct() // expected-error {{'y' consumed more than once}}
-        y = self // expected-note {{consuming use}}
+        y = self // expected-note {{consuming use here}}
         // We get an infinite recursion since we are going to call our own
         // deinit here. We are just testing diagnostics here though.
         _ = y // expected-warning {{function call causes an infinite recursion}}
-        // expected-note @-1 {{consuming use}}
-        let z = y // expected-note {{consuming use}}
+        // expected-note @-1 {{consuming use here}}
+        let z = y // expected-note {{consuming use here}}
         let _ = z
-        globalMoveOnlyStruct = self // expected-note {{consuming use}}
-    } // expected-note {{consuming use}}
+        globalMoveOnlyStruct = self // expected-note {{consuming use here}}
+    } // expected-note {{consuming use here}}
 }
 
 @_moveOnly
@@ -30,14 +30,14 @@ enum MoveOnlyEnum {
     case rhs(Klass)
 
     deinit { // expected-error {{'self' consumed more than once}}
-        let x = self // expected-note {{consuming use}}
+        let x = self // expected-note {{consuming use here}}
         _ = x
         var y = MoveOnlyEnum.lhs(Klass())
-        y = self // expected-note {{consuming use}}
+        y = self // expected-note {{consuming use here}}
         // We get an infinite recursion since we are going to call our own
         // deinit here. We are just testing diagnostics here though.
         // expected-warning @-3 {{function call causes an infinite recursion}}
         _ = y 
-        globalMoveOnlyEnum = self // expected-note {{consuming use}}
-    } // expected-note {{consuming use}}
+        globalMoveOnlyEnum = self // expected-note {{consuming use here}}
+    } // expected-note {{consuming use here}}
 }