[NFC] Update diagnostic msg

Author: meg-gupta

include/swift/AST/DiagnosticsSema.def

@@ -8169,8 +8169,8 @@ ERROR(lifetime_dependence_invalid_inherit_escapable_type, none,
       "'@lifetime(borrow %0)' instead",
       (StringRef))
 ERROR(lifetime_dependence_cannot_use_parsed_borrow_consuming, none,
-      "invalid use of borrow dependence with consuming ownership",
-      ())
+      "invalid use of %0 dependence with %1 ownership",
+      (StringRef, StringRef))
 ERROR(lifetime_dependence_cannot_use_default_escapable_consuming, none,
       "invalid lifetime dependence on Escapable value with %0 ownership",
       (StringRef))

include/swift/AST/LifetimeDependence.h

@@ -183,6 +183,7 @@ class LifetimeEntry final
          ArrayRef<LifetimeDescriptor> sources,
          std::optional<LifetimeDescriptor> targetDescriptor = std::nullopt);
 
+  std::string getString() const;
   SourceLoc getLoc() const { return startLoc; }
   SourceLoc getStartLoc() const { return startLoc; }
   SourceLoc getEndLoc() const { return endLoc; }
@@ -194,38 +195,6 @@ class LifetimeEntry final
   std::optional<LifetimeDescriptor> getTargetDescriptor() const {
     return targetDescriptor;
   }
-
-  std::string getString() const {
-    std::string result = "@lifetime(";
-    if (targetDescriptor.has_value()) {
-      result += targetDescriptor->getString();
-      result += ": ";
-    }
-
-    bool firstElem = true;
-    for (auto source : getSources()) {
-      if (!firstElem) {
-        result += ", ";
-      }
-      switch (source.getParsedLifetimeDependenceKind()) {
-      case ParsedLifetimeDependenceKind::Borrow:
-        result += "borrow ";
-        break;
-      case ParsedLifetimeDependenceKind::Inherit:
-        result += "copy ";
-        break;
-      case ParsedLifetimeDependenceKind::InOut:
-        result += "inout ";
-        break;
-      default:
-        break;
-      }
-      result += source.getString();
-      firstElem = false;
-    }
-    result += ")";
-    return result;
-  }
 };
 
 class LifetimeDependenceInfo {
@@ -370,6 +339,9 @@ filterEscapableLifetimeDependencies(GenericSignature sig,
         SmallVectorImpl<LifetimeDependenceInfo> &outputs,
         llvm::function_ref<Type (unsigned targetIndex)> getSubstTargetType);
 
+StringRef
+getNameForParsedLifetimeDependenceKind(ParsedLifetimeDependenceKind kind);
+
 } // namespace swift
 
 #endif

lib/AST/LifetimeDependence.cpp

@@ -37,6 +37,35 @@ LifetimeEntry::create(const ASTContext &ctx, SourceLoc startLoc,
   return new (mem) LifetimeEntry(startLoc, endLoc, sources, targetDescriptor);
 }
 
+std::string LifetimeEntry::getString() const {
+  std::string result = "@lifetime(";
+  if (targetDescriptor.has_value()) {
+    result += targetDescriptor->getString();
+    result += ": ";
+  }
+
+  bool firstElem = true;
+  for (auto source : getSources()) {
+    if (!firstElem) {
+      result += ", ";
+    }
+    auto lifetimeKind = source.getParsedLifetimeDependenceKind();
+    auto kindString = getNameForParsedLifetimeDependenceKind(lifetimeKind);
+    bool printSpace = (lifetimeKind == ParsedLifetimeDependenceKind::Borrow ||
+                       lifetimeKind == ParsedLifetimeDependenceKind::Copy);
+    if (!kindString.empty()) {
+      result += kindString;
+    }
+    if (printSpace) {
+      result += " ";
+    }
+    result += source.getString();
+    firstElem = false;
+  }
+  result += ")";
+  return result;
+}
+
 std::optional<LifetimeDependenceInfo>
 getLifetimeDependenceFor(ArrayRef<LifetimeDependenceInfo> lifetimeDependencies,
                          unsigned index) {
@@ -82,7 +111,7 @@ getNameForParsedLifetimeDependenceKind(ParsedLifetimeDependenceKind kind) {
   case ParsedLifetimeDependenceKind::Inherit:
     return "copy";
   case ParsedLifetimeDependenceKind::Inout:
-    return "inout";
+    return "&";
   default:
     return "";
   }
@@ -572,7 +601,7 @@ class LifetimeDependenceChecker {
   std::optional<LifetimeDependenceKind>
   getDependenceKindFromDescriptor(LifetimeDescriptor descriptor,
                                   ParamDecl *decl) {
-    auto loc = decl->getLoc();
+    auto loc = descriptor.getLoc();
     auto type = decl->getTypeInContext();
     auto parsedLifetimeKind = descriptor.getParsedLifetimeDependenceKind();
     auto ownership = decl->getValueOwnership();
@@ -602,9 +631,12 @@ class LifetimeDependenceChecker {
 
     // @lifetime(borrow x) is valid only for borrowing parameters.
     // @lifetime(inout x) is valid only for inout parameters.
-    if (!isCompatibleWithOwnership(parsedLifetimeKind, type, ownership)) {
+    if (!isCompatibleWithOwnership(parsedLifetimeKind, type,
+                                   loweredOwnership)) {
       diagnose(loc,
-               diag::lifetime_dependence_cannot_use_parsed_borrow_consuming);
+               diag::lifetime_dependence_cannot_use_parsed_borrow_consuming,
+               getNameForParsedLifetimeDependenceKind(parsedLifetimeKind),
+               getOwnershipSpelling(loweredOwnership));
       return std::nullopt;
     }
     // @lifetime(copy x) is only invalid for Escapable types.