[move-only] Wire up emission of the location for non-consuming uses for objects and emit more precise errors for consuming use errors.

Specifically, previously if we emitted an error we just dumped all of the
consuming uses. Now instead for each consuming use that needs a copy, we perform
a search for a specific boundary use (consuming or non-consuming) that is
reachable from the former and emit a specialized error for it. Thus we emit for
the two consuming case the normal consumed twice error, and now for
non-consuming errors we emit the "use after consume" error.

Author: gottesmm

include/swift/AST/DiagnosticsSIL.def

@@ -730,7 +730,7 @@ ERROR(sil_moveonlychecker_owned_value_consumed_more_than_once, none,
 ERROR(sil_moveonlychecker_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,
-      "'%0' used after consume. Lifetime extension of variable requires a copy", (StringRef))
+      "'%0' used after consume", (StringRef))
 ERROR(sil_moveonlychecker_guaranteed_value_consumed, none,
       "'%0' has guaranteed ownership but was consumed", (StringRef))
 ERROR(sil_moveonlychecker_guaranteed_value_captured_by_closure, none,
@@ -754,6 +754,8 @@ 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,
+     "other 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,
@@ -762,6 +764,9 @@ NOTE(sil_moveonlychecker_consuming_closure_use_here, none,
      "closure capture 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", ())
+
 ERROR(sil_moveonlychecker_not_understand_no_implicit_copy, none,
       "Usage of @noImplicitCopy that the move checker does not know how to "
       "check!", ())

include/swift/SIL/PrunedLiveness.h

@@ -553,7 +553,7 @@ class PrunedLiveness {
   /// A namespace containing helper functors for use with various mapped
   /// ranges. Intended to be used to hide these noise types when working in an
   /// IDE.
-  struct LifetimeEndingUserIteratorHelpers {
+  struct RangeIterationHelpers {
     struct MapFunctor {
       SILInstruction *
       operator()(const std::pair<SILInstruction *, bool> &pair) const {
@@ -562,27 +562,56 @@ class PrunedLiveness {
       }
     };
 
-    struct FilterFunctor {
-      bool operator()(const std::pair<SILInstruction *, bool> &pair) const {
-        return pair.second;
-      }
+    struct LifetimeEnding {
+      struct FilterFunctor {
+        bool operator()(const std::pair<SILInstruction *, bool> &pair) const {
+          return pair.second;
+        }
+      };
+
+      using MapFilterIter = llvm::mapped_iterator<
+          llvm::filter_iterator<const std::pair<SILInstruction *, bool> *,
+                                FilterFunctor>,
+          MapFunctor>;
     };
 
-    using MapFilterIter = llvm::mapped_iterator<
-        llvm::filter_iterator<const std::pair<SILInstruction *, bool> *,
-                              FilterFunctor>,
-        MapFunctor>;
+    struct NonLifetimeEnding {
+      struct FilterFunctor {
+        bool operator()(const std::pair<SILInstruction *, bool> &pair) const {
+          return !pair.second;
+        }
+      };
+
+      using MapFilterIter = llvm::mapped_iterator<
+          llvm::filter_iterator<const std::pair<SILInstruction *, bool> *,
+                                FilterFunctor>,
+          MapFunctor>;
+    };
   };
-  using LifetimeEndingUserRange =
-      llvm::iterator_range<LifetimeEndingUserIteratorHelpers::MapFilterIter>;
+  using LifetimeEndingUserRange = llvm::iterator_range<
+      RangeIterationHelpers::LifetimeEnding::MapFilterIter>;
 
   /// Return a range consisting of the current set of consuming users fed into
   /// this PrunedLiveness instance.
   LifetimeEndingUserRange getLifetimeEndingUsers() const {
     return map_range(
         llvm::make_filter_range(
-            getAllUsers(), LifetimeEndingUserIteratorHelpers::FilterFunctor()),
-        LifetimeEndingUserIteratorHelpers::MapFunctor());
+            getAllUsers(),
+            RangeIterationHelpers::LifetimeEnding::FilterFunctor()),
+        RangeIterationHelpers::MapFunctor());
+  }
+
+  using NonLifetimeEndingUserRange = llvm::iterator_range<
+      RangeIterationHelpers::NonLifetimeEnding::MapFilterIter>;
+
+  /// Return a range consisting of the current set of non lifetime ending users
+  /// fed into this PrunedLiveness instance.
+  NonLifetimeEndingUserRange getNonLifetimeEndingUsers() const {
+    return map_range(
+        llvm::make_filter_range(
+            getAllUsers(),
+            RangeIterationHelpers::NonLifetimeEnding::FilterFunctor()),
+        RangeIterationHelpers::MapFunctor());
   }
 
   void print(llvm::raw_ostream &OS) const;

include/swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h

@@ -360,6 +360,11 @@ class CanonicalizeOSSALifetime final {
     return liveness.getLifetimeEndingUsers();
   }
 
+  using NonLifetimeEndingUserRange = PrunedLiveness::NonLifetimeEndingUserRange;
+  NonLifetimeEndingUserRange getNonLifetimeEndingUsers() const {
+    return liveness.getNonLifetimeEndingUsers();
+  }
+
   using UserRange = PrunedLiveness::ConstUserRange;
   UserRange getUsers() const { return liveness.getAllUsers(); }