reword 'other consume here' to 'consumed again here'

this also fixes a bug where sometimes we simply emit
'consumed here' twice and other times we'd said 'other
consume here' for the same "consumed more than once"
message. so I went through and changed all of the 2nd
consumes into "consumed again".

rdar://109281444
(cherry picked from commit 03d2017)

Author: kavon

include/swift/AST/DiagnosticsSIL.def

@@ -782,8 +782,8 @@ NOTE(sil_movechecking_partial_consume_here, none,
      "partially consumed here", ())
 NOTE(sil_movechecking_consuming_use_here, none,
      "consumed here", ())
-NOTE(sil_movechecking_other_consuming_use_here, none,
-     "other consume here", ())
+NOTE(sil_movechecking_consumed_again_here, none,
+     "consumed again here", ())
 NOTE(sil_movechecking_two_consuming_uses_here, none,
      "multiple consumes here", ())
 NOTE(sil_movechecking_consuming_and_non_consuming_uses_here, none,
@@ -801,8 +801,7 @@ NOTE(sil_movechecking_deinit_here, 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_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!", ())
+      "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", ())
 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_movechecking_bug_exclusivity_violation, none,

lib/SILOptimizer/Mandatory/MoveOnlyDiagnostics.cpp

@@ -285,7 +285,7 @@ void DiagnosticEmitter::emitObjectOwnedDiagnostic(
         diagnose(astContext, user,
                  diag::sil_movechecking_consuming_use_here);
         diagnose(astContext, &*ii,
-                 diag::sil_movechecking_other_consuming_use_here);
+                 diag::sil_movechecking_consumed_again_here);
         break;
       }
 
@@ -333,7 +333,7 @@ void DiagnosticEmitter::emitObjectOwnedDiagnostic(
           diagnose(astContext, user,
                    diag::sil_movechecking_consuming_use_here);
           diagnose(astContext, iter->second,
-                   diag::sil_movechecking_other_consuming_use_here);
+                   diag::sil_movechecking_consumed_again_here);
           break;
         }
       }
@@ -476,7 +476,7 @@ void DiagnosticEmitter::emitAddressDiagnostic(MarkMustCheckInst *markedValue,
     diagnose(astContext, violatingUser,
              diag::sil_movechecking_consuming_use_here);
     diagnose(astContext, lastLiveUser,
-             diag::sil_movechecking_consuming_use_here);
+             diag::sil_movechecking_consumed_again_here);
     return;
   }
 

test/SILGen/moveonly_escaping_closure.swift

@@ -134,7 +134,7 @@ func testLocalLetClosureCaptureVar() {
         borrowVal(x)
         consumeVal(x) // expected-note {{consumed here}}
         consumeVal(x) // expected-note {{consumed here}}
-        // expected-note @-1 {{consumed here}}
+        // expected-note @-1 {{consumed again here}}
         borrowConsumeVal(x, x)
         // expected-error @-1 {{overlapping accesses, but deinitialization requires exclusive access}}
         // expected-note @-2 {{conflicting access is here}}
@@ -937,7 +937,7 @@ func testLocalLetClosureCaptureConsuming(_ x: consuming SingleElt) {
         borrowVal(x)
         consumeVal(x) // expected-note {{consumed here}}
         consumeVal(x) // expected-note {{consumed here}}
-        // expected-note @-1 {{consumed here}}
+        // expected-note @-1 {{consumed again here}}
         borrowConsumeVal(x, x) // expected-note {{used here}}
         // expected-error @-1 {{overlapping accesses, but deinitialization requires exclusive access}}
         // expected-note @-2 {{conflicting access is here}}

test/SILOptimizer/moveonly_addresschecker_diagnostics.sil

@@ -112,7 +112,7 @@ bb0(%0 : $Int):
   %20 = move_value %19 : $Klass
   destroy_value %20 : $Klass
   destroy_value %17 : $Klass
-  %23 = load [copy] %3 : $*AggStruct // expected-note {{consumed here}}
+  %23 = load [copy] %3 : $*AggStruct // expected-note {{consumed again here}}
   destroy_addr %3 : $*AggStruct
   dealloc_stack %2 : $*AggStruct
   return %23 : $AggStruct
@@ -145,7 +145,7 @@ bb2(%55 : $Int):
   %58 = struct_element_addr %57 : $*KlassPair, #KlassPair.lhs
   %59 = load [copy] %58 : $*Klass
   // expected-note @-1 {{consumed here}}
-  // expected-note @-2 {{consumed here}}
+  // expected-note @-2 {{consumed again here}}
   end_access %56 : $*AggStruct
   %61 = function_ref @classConsume : $@convention(thin) (@owned Klass) -> ()
   %62 = apply %61(%59) : $@convention(thin) (@owned Klass) -> ()
@@ -214,7 +214,7 @@ bb0(%arg : @owned $NonTrivialStruct, %arg1 : @owned $NonTrivialStruct):
   %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 {{consumed here}}
+  %27 = load [copy] %26 : $*Klass // expected-note {{consumed again here}}
   end_access %25 : $*NonTrivialStruct
   %29 = function_ref @classConsume : $@convention(thin) (@owned Klass) -> ()
   %30 = apply %29(%27) : $@convention(thin) (@owned Klass) -> ()
@@ -266,7 +266,7 @@ bb0(%0 : @owned $NonTrivialStruct):
   destroy_value %11 : $@callee_guaranteed () -> ()
   %14 = alloc_stack $NonTrivialStruct, let, name "x3"
   %15 = mark_must_check [consumable_and_assignable] %14 : $*NonTrivialStruct
-  %16 = load [copy] %4 : $*NonTrivialStruct // expected-note {{consumed here}}
+  %16 = load [copy] %4 : $*NonTrivialStruct // expected-note {{consumed again here}}
   store %16 to [init] %15 : $*NonTrivialStruct
   %18 = load [copy] %15 : $*NonTrivialStruct
   %19 = move_value %18 : $NonTrivialStruct
@@ -314,7 +314,7 @@ bb0(%0 : $*Klass):
   %8 = begin_access [read] [static] %1 : $*Klass
   %9 = load [copy] %8 : $*Klass
   // expected-note @-1 {{consumed here}}
-  // expected-note @-2 {{consumed here}}
+  // expected-note @-2 {{consumed again here}}
   end_access %8 : $*Klass
   %11 = begin_access [modify] [static] %4 : $*Klass
   store %9 to [assign] %11 : $*Klass