batch 2

Author: kavon

include/swift/AST/DiagnosticsSIL.def

@@ -754,20 +754,22 @@ ERROR(sil_moveonlychecker_value_used_after_consume, none,
       "'%0' used after consume", (StringRef))
 ERROR(sil_moveonlychecker_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,
       "'%0' is borrowed and cannot be consumed by closure capture", (StringRef))
+
 ERROR(sil_moveonlychecker_let_value_consumed_in_closure, none,
       "captured '%0' cannot be consumed within a closure", (StringRef))
 ERROR(sil_moveonlychecker_inout_not_reinitialized_before_end_of_function, none,
-      "'%0' consumed but not reinitialized before end of function", (StringRef))
-ERROR(sil_moveonlychecker_inout_not_reinitialized_before_end_of_closure, none,
-      "'%0' consumed in closure but not reinitialized before end of closure", (StringRef))
+      "missing reinitialization of '$0' after consume", (StringRef))
 ERROR(sil_moveonlychecker_value_consumed_in_a_loop, none,
       "'%0' consumed by a use in a loop", (StringRef))
-ERROR(sil_moveonlychecker_exclusivity_violation, none,
-      "'%0' has consuming use that cannot be eliminated due to a tight exclusivity scope", (StringRef))
+
+// FIXME: feels like the situations where these are emitted aren't suppose to be
+//  treated as a consume at all. Leaving the message mostly as-is for now.
 ERROR(sil_moveonlychecker_moveonly_field_consumed, none,
-      "'%0' has a move only field that was consumed before later uses", (StringRef))
+      "'%0' has a noncopyable field that was consumed before later uses", (StringRef))
 
 ERROR(sil_moveonlychecker_notconsumable_but_assignable_was_consumed_classfield_let, none,
       "'%0' was consumed but it is illegal to consume a noncopyable class let field. One can only read from it",
@@ -820,8 +822,12 @@ ERROR(sil_moveonlychecker_not_understand_consumable_and_assignable, none,
 ERROR(sil_moveonlychecker_not_understand_moveonly, none,
       "Usage of a move only type that the move checker does not know how to "
       "check!", ())
-ERROR(sil_moveonlychecker_missed_copy, none,
+
+ERROR(sil_moveonlychecker_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,
+      "'%0' has an unexpected exclusivity violation. This is a compiler bug. Please file a bug with a small example of the bug", (StringRef))
+
 
 // move kills copyable values checker diagnostics
 ERROR(sil_movekillscopyablevalue_value_consumed_more_than_once, none,

lib/SILOptimizer/Mandatory/MoveOnlyDiagnostics.cpp

@@ -187,7 +187,7 @@ void DiagnosticEmitter::emitCheckerDoesntUnderstandDiagnostic(
 
 void DiagnosticEmitter::emitCheckedMissedCopyError(SILInstruction *copyInst) {
   diagnose(copyInst->getFunction()->getASTContext(), copyInst,
-           diag::sil_moveonlychecker_missed_copy);
+           diag::sil_moveonlychecker_bug_missed_copy);
 }
 
 //===----------------------------------------------------------------------===//
@@ -417,7 +417,7 @@ void DiagnosticEmitter::emitAddressExclusivityHazardDiagnostic(
   LLVM_DEBUG(llvm::dbgs() << "    Consuming use: " << *consumingUser);
 
   diagnose(astContext, markedValue,
-           diag::sil_moveonlychecker_exclusivity_violation, varName);
+           diag::sil_moveonlychecker_bug_exclusivity_violation, varName);
   diagnose(astContext, consumingUser,
            diag::sil_moveonlychecker_consuming_use_here);
 }
@@ -453,32 +453,6 @@ void DiagnosticEmitter::emitAddressDiagnostic(MarkMustCheckInst *markedValue,
   }
 
   if (isInOutEndOfFunction) {
-    if (auto *pbi = dyn_cast<ProjectBoxInst>(markedValue->getOperand())) {
-      if (auto *fArg = dyn_cast<SILFunctionArgument>(pbi->getOperand())) {
-        if (fArg->isClosureCapture()) {
-          diagnose(
-              astContext, markedValue,
-              diag::
-                  sil_moveonlychecker_inout_not_reinitialized_before_end_of_closure,
-              varName);
-          diagnose(astContext, violatingUser,
-                   diag::sil_moveonlychecker_consuming_use_here);
-          return;
-        }
-      }
-    }
-    if (auto *fArg = dyn_cast<SILFunctionArgument>(markedValue->getOperand())) {
-      if (fArg->isClosureCapture()) {
-        diagnose(
-            astContext, markedValue,
-            diag::
-                sil_moveonlychecker_inout_not_reinitialized_before_end_of_closure,
-            varName);
-        diagnose(astContext, violatingUser,
-                 diag::sil_moveonlychecker_consuming_use_here);
-        return;
-      }
-    }
     diagnose(
         astContext, markedValue,
         diag::
@@ -531,18 +505,6 @@ void DiagnosticEmitter::emitInOutEndOfFunctionDiagnostic(
 
   // Otherwise, we need to do no implicit copy semantics. If our last use was
   // consuming message:
-  if (auto *fArg = dyn_cast<SILFunctionArgument>(markedValue->getOperand())) {
-    if (fArg->isClosureCapture()) {
-      diagnose(
-          astContext, markedValue,
-          diag::
-              sil_moveonlychecker_inout_not_reinitialized_before_end_of_closure,
-          varName);
-      diagnose(astContext, violatingUser,
-               diag::sil_moveonlychecker_consuming_use_here);
-      return;
-    }
-  }
   diagnose(
       astContext, markedValue,
       diag::sil_moveonlychecker_inout_not_reinitialized_before_end_of_function,

test/SILOptimizer/moveonly_addresschecker_diagnostics.sil

@@ -304,7 +304,7 @@ sil [ossa] @classSimpleChainArgTest : $@convention(thin) (@inout Klass) -> () {
 bb0(%0 : $*Klass):
   %1 = mark_must_check [consumable_and_assignable] %0 : $*Klass
   // expected-error @-1 {{'x2' consumed more than once}}
-  // expected-error @-2 {{'x2' consumed but not reinitialized before end of function}}
+  // expected-error @-2 {{missing reinitialization of 'x2' after consume}}
   debug_value %1 : $*Klass, var, name "x2", argno 1, expr op_deref
   %3 = alloc_stack [lexical] $Klass, var, name "y2"
   %4 = mark_must_check [consumable_and_assignable] %3 : $*Klass