Update SIL printing of @Lifetime

Lifetime dependencies in SIL tests continue to be represented as a type modifier on the target.

As before, they are represented as a LifetimeDependentTypeRepr in the AST.

Author: meg-gupta

include/swift/Parse/Parser.h

@@ -1201,6 +1201,9 @@ class Parser {
 
   bool isParameterSpecifier() {
     if (Tok.is(tok::kw_inout)) return true;
+    if (Context.LangOpts.hasFeature(Feature::NonescapableTypes) &&
+        isSILLifetimeDependenceToken())
+      return true;
     if (!canHaveParameterSpecifierContextualKeyword()) return false;
     if (Tok.isContextualKeyword("__shared") ||
         Tok.isContextualKeyword("__owned") ||
@@ -1212,9 +1215,6 @@ class Parser {
     if (Context.LangOpts.hasFeature(Feature::SendingArgsAndResults) &&
         Tok.isContextualKeyword("sending"))
       return true;
-    if (Context.LangOpts.hasFeature(Feature::NonescapableTypes) &&
-        isLifetimeDependenceToken())
-      return true;
     return false;
   }
 
@@ -1225,9 +1225,9 @@ class Parser {
     consumeToken();
   }
 
-  bool isLifetimeDependenceToken() {
-    return isInSILMode() && (Tok.isContextualKeyword("_inherit") ||
-                             Tok.isContextualKeyword("_scope"));
+  bool isSILLifetimeDependenceToken() {
+    return isInSILMode() && Tok.is(tok::at_sign) &&
+           (peekToken().isContextualKeyword("lifetime"));
   }
 
   bool canHaveParameterSpecifierContextualKeyword() {
@@ -1248,7 +1248,7 @@ class Parser {
         return true;
     }
 
-    return isLifetimeDependenceToken();
+    return false;
   }
 
   bool parseConventionAttributeInternal(SourceLoc atLoc, SourceLoc attrLoc,

lib/AST/LifetimeDependence.cpp

@@ -45,29 +45,39 @@ getLifetimeDependenceFor(ArrayRef<LifetimeDependenceInfo> lifetimeDependencies,
 }
 
 std::string LifetimeDependenceInfo::getString() const {
-  std::string lifetimeDependenceString;
-  auto getOnIndices = [](IndexSubset *bitvector) {
+  std::string lifetimeDependenceString = "@lifetime(";
+  auto getSourceString = [](IndexSubset *bitvector, StringRef kind) {
     std::string result;
     bool isFirstSetBit = true;
     for (unsigned i = 0; i < bitvector->getCapacity(); i++) {
       if (bitvector->contains(i)) {
         if (!isFirstSetBit) {
           result += ", ";
         }
+        result += kind;
         result += std::to_string(i);
         isFirstSetBit = false;
       }
     }
     return result;
   };
-  if (inheritLifetimeParamIndices && !inheritLifetimeParamIndices->isEmpty()) {
-    lifetimeDependenceString =
-        "_inherit(" + getOnIndices(inheritLifetimeParamIndices) + ") ";
+  if (inheritLifetimeParamIndices) {
+    assert(!inheritLifetimeParamIndices->isEmpty());
+    lifetimeDependenceString +=
+        getSourceString(inheritLifetimeParamIndices, "copy ");
   }
-  if (scopeLifetimeParamIndices && !scopeLifetimeParamIndices->isEmpty()) {
+  if (scopeLifetimeParamIndices) {
+    assert(!scopeLifetimeParamIndices->isEmpty());
+    if (inheritLifetimeParamIndices) {
+      lifetimeDependenceString += ", ";
+    }
     lifetimeDependenceString +=
-        "_scope(" + getOnIndices(scopeLifetimeParamIndices) + ") ";
+        getSourceString(scopeLifetimeParamIndices, "borrow ");
+  }
+  if (isImmortal()) {
+    lifetimeDependenceString += "immortal";
   }
+  lifetimeDependenceString += ") ";
   return lifetimeDependenceString;
 }
 

lib/Parse/ParseDecl.cpp

@@ -5136,17 +5136,24 @@ ParserStatus Parser::parseTypeAttribute(TypeOrCustomAttr &result,
   llvm_unreachable("bad attribute kind");
 }
 
-static ParsedLifetimeDependenceKind getSILLifetimeDependenceKind(const Token &T) {
-  if (T.isContextualKeyword("_inherit")) {
-    return ParsedLifetimeDependenceKind::Inherit;
-  }
-  assert(T.isContextualKeyword("_scope"));
-  return ParsedLifetimeDependenceKind::Scope;
-}
-
 ParserResult<LifetimeEntry> Parser::parseLifetimeEntry(SourceLoc loc) {
   ParserStatus status;
 
+  auto getLifetimeDependenceKind =
+      [&](Token Tok) -> std::optional<ParsedLifetimeDependenceKind> {
+    if (Tok.isContextualKeyword("copy") &&
+        peekToken().isAny(tok::identifier, tok::integer_literal,
+                          tok::kw_self)) {
+      return ParsedLifetimeDependenceKind::Inherit;
+    }
+    if (Tok.isContextualKeyword("borrow") &&
+        peekToken().isAny(tok::identifier, tok::integer_literal,
+                          tok::kw_self)) {
+      return ParsedLifetimeDependenceKind::Scope;
+    }
+    return std::nullopt;
+  };
+
   if (!Tok.isFollowingLParen()) {
     diagnose(loc, diag::expected_lparen_after_lifetime_dependence);
     status.setIsParseError();
@@ -5174,13 +5181,14 @@ ParserResult<LifetimeEntry> Parser::parseLifetimeEntry(SourceLoc loc) {
       diag::expected_rparen_after_lifetime_dependence, [&]() -> ParserStatus {
         ParserStatus listStatus;
         foundParamId = true;
+
         auto lifetimeDependenceKind = ParsedLifetimeDependenceKind::Default;
-        if (Tok.isContextualKeyword("borrow") &&
-            peekToken().isAny(tok::identifier, tok::integer_literal,
-                              tok::kw_self)) {
-          lifetimeDependenceKind = ParsedLifetimeDependenceKind::Scope;
+        auto result = getLifetimeDependenceKind(Tok);
+        if (result.has_value()) {
+          lifetimeDependenceKind = *result;
           consumeToken();
         }
+
         auto sourceDescriptor =
             parseLifetimeDescriptor(Tok, lifetimeDependenceKind);
         if (!sourceDescriptor) {
@@ -5460,7 +5468,6 @@ ParserStatus Parser::ParsedTypeAttributeList::slowParse(Parser &P) {
   PatternBindingInitializer *initContext = nullptr;
   auto &Tok = P.Tok;
   while (P.isParameterSpecifier()) {
-
     if (Tok.isContextualKeyword("isolated")) {
       Tok.setKind(tok::contextual_keyword);
       auto kwLoc = P.consumeToken();
@@ -5504,13 +5511,14 @@ ParserStatus Parser::ParsedTypeAttributeList::slowParse(Parser &P) {
       continue;
     }
 
-    if (P.isLifetimeDependenceToken()) {
+    if (P.isSILLifetimeDependenceToken()) {
       if (!P.Context.LangOpts.hasFeature(Feature::NonescapableTypes)) {
         P.diagnose(Tok, diag::requires_experimental_feature,
                    "lifetime dependence specifier", false,
                    getFeatureName(Feature::NonescapableTypes));
       }
-      auto loc = P.consumeToken();
+      P.consumeToken(); // consume '@'
+      auto loc = P.consumeToken(); // consume 'lifetime'
       auto result = P.parseLifetimeEntry(loc);
       if (result.isNull()) {
         status |= result;

test/Interop/Cxx/class/nonescapable-lifetimebound.swift

@@ -69,12 +69,12 @@ private:
 };
 
 // CHECK: sil [clang makeOwner] {{.*}}: $@convention(c) () -> Owner
-// CHECK: sil [clang getView] {{.*}} : $@convention(c) (@in_guaranteed Owner) -> _scope(0) @autoreleased View
-// CHECK: sil [clang getViewFromFirst] {{.*}} : $@convention(c) (@in_guaranteed Owner, @in_guaranteed Owner) -> _scope(0) @autoreleased View
-// CHECK: sil [clang getViewFromEither] {{.*}} : $@convention(c) (@in_guaranteed Owner, @in_guaranteed Owner) -> _scope(0, 1) @autoreleased View
-// CHECK: sil [clang Owner.handOutView] {{.*}} : $@convention(cxx_method) (@in_guaranteed Owner) -> _scope(0) @autoreleased View
-// CHECK: sil [clang Owner.handOutView2] {{.*}} : $@convention(cxx_method) (View, @in_guaranteed Owner) -> _scope(1) @autoreleased View
-// CHECK: sil [clang getViewFromEither] {{.*}} : $@convention(c) (@guaranteed View, @guaranteed View) -> _inherit(0, 1) @autoreleased View
+// CHECK: sil [clang getView] {{.*}} : $@convention(c) (@in_guaranteed Owner) -> _lifetime(_borrow 0) @autoreleased View
+// CHECK: sil [clang getViewFromFirst] {{.*}} : $@convention(c) (@in_guaranteed Owner, @in_guaranteed Owner) -> _lifetime(_borrow 0) @autoreleased View
+// CHECK: sil [clang getViewFromEither] {{.*}} : $@convention(c) (@in_guaranteed Owner, @in_guaranteed Owner) -> _lifetime(_borrow 0, _borrow 1) @autoreleased View
+// CHECK: sil [clang Owner.handOutView] {{.*}} : $@convention(cxx_method) (@in_guaranteed Owner) -> _lifetime(_borrow 0) @autoreleased View
+// CHECK: sil [clang Owner.handOutView2] {{.*}} : $@convention(cxx_method) (View, @in_guaranteed Owner) -> _lifetime(_borrow 1) @autoreleased View
+// CHECK: sil [clang getViewFromEither] {{.*}} : $@convention(c) (@guaranteed View, @guaranteed View) -> _lifetime(_copy 0, _copy 1) @autoreleased View
 // CHECK: sil [clang View.init] {{.*}} : $@convention(c) () -> @out View
 
 //--- test.swift
@@ -91,4 +91,4 @@ public func test() {
     let _ = o.handOutView2(v1)
     let _ = getViewFromEither(v1, v2)
     let defaultView = View()
-}
+}