Rename ParsedLifetimeDependenceKind::Scope -> ParsedLifetimeDependenceKind::Borrow

Author: meg-gupta

include/swift/AST/ASTBridging.h

@@ -1079,7 +1079,7 @@ BridgedInlineAttr BridgedInlineAttr_createParsed(BridgedASTContext cContext,
 
 enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedParsedLifetimeDependenceKind {
   BridgedParsedLifetimeDependenceKindDefault,
-  BridgedParsedLifetimeDependenceKindScope,
+  BridgedParsedLifetimeDependenceKindBorrow,
   BridgedParsedLifetimeDependenceKindInherit,
   BridgedParsedLifetimeDependenceKindInout
 };

include/swift/AST/LifetimeDependence.h

@@ -38,7 +38,7 @@ class SILResultInfo;
 
 enum class ParsedLifetimeDependenceKind : uint8_t {
   Default = 0,
-  Scope,
+  Borrow,
   Inherit, // Only used with deserialized decls
   Inout
 };
@@ -208,12 +208,15 @@ class LifetimeEntry final
         result += ", ";
       }
       switch (source.getParsedLifetimeDependenceKind()) {
-      case ParsedLifetimeDependenceKind::Scope:
+      case ParsedLifetimeDependenceKind::Borrow:
         result += "borrow ";
         break;
       case ParsedLifetimeDependenceKind::Inherit:
         result += "copy ";
         break;
+      case ParsedLifetimeDependenceKind::InOut:
+        result += "inout ";
+        break;
       default:
         break;
       }

lib/AST/Bridging/DeclAttributeBridging.cpp

@@ -470,8 +470,8 @@ unbridged(BridgedParsedLifetimeDependenceKind kind) {
   switch (kind) {
   case BridgedParsedLifetimeDependenceKindDefault:
     return swift::ParsedLifetimeDependenceKind::Default;
-  case BridgedParsedLifetimeDependenceKindScope:
-    return swift::ParsedLifetimeDependenceKind::Scope;
+  case BridgedParsedLifetimeDependenceKindBorrow:
+    return swift::ParsedLifetimeDependenceKind::Borrow;
   case BridgedParsedLifetimeDependenceKindInherit:
     return swift::ParsedLifetimeDependenceKind::Inherit;
   case BridgedParsedLifetimeDependenceKindInout:

lib/AST/LifetimeDependence.cpp

@@ -51,7 +51,7 @@ getLifetimeDependenceFor(ArrayRef<LifetimeDependenceInfo> lifetimeDependencies,
 StringRef
 getNameForParsedLifetimeDependenceKind(ParsedLifetimeDependenceKind kind) {
   switch (kind) {
-  case ParsedLifetimeDependenceKind::Scope:
+  case ParsedLifetimeDependenceKind::Borrow:
     return "borrow";
   case ParsedLifetimeDependenceKind::Inherit:
     return "copy";
@@ -447,7 +447,7 @@ class LifetimeDependenceChecker {
     auto loweredOwnership = ownership != ValueOwnership::Default
       ? ownership : getLoweredOwnership(afd);
 
-    if (kind == ParsedLifetimeDependenceKind::Scope) {
+    if (kind == ParsedLifetimeDependenceKind::Borrow) {
       return loweredOwnership == ValueOwnership::Shared;
     }
     assert(kind == ParsedLifetimeDependenceKind::Inout);
@@ -1140,7 +1140,7 @@ static std::optional<LifetimeDependenceInfo> checkSILTypeModifiers(
       auto loc = descriptor.getLoc();
       auto kind = descriptor.getParsedLifetimeDependenceKind();
 
-      if (kind == ParsedLifetimeDependenceKind::Scope &&
+      if (kind == ParsedLifetimeDependenceKind::Borrow &&
           isConsumedParameterInCallee(paramConvention)) {
         diags.diagnose(loc, diag::lifetime_dependence_cannot_use_kind, "_scope",
                        getStringForParameterConvention(paramConvention));
@@ -1155,7 +1155,7 @@ static std::optional<LifetimeDependenceInfo> checkSILTypeModifiers(
       if (kind == ParsedLifetimeDependenceKind::Inherit) {
         inheritLifetimeParamIndices.set(paramIndexToSet);
       } else {
-        assert(kind == ParsedLifetimeDependenceKind::Scope);
+        assert(kind == ParsedLifetimeDependenceKind::Borrow);
         scopeLifetimeParamIndices.set(paramIndexToSet);
       }
       return false;

lib/ASTGen/Sources/ASTGen/DeclAttrs.swift

@@ -1102,7 +1102,7 @@ extension ASTGenVisitor {
       lifetimeDependenceKind = .inherit
       descriptorExpr = copyExpr.expression
     } else if let borrowExpr = node.as(BorrowExprSyntax.self) {
-      lifetimeDependenceKind = .scope
+      lifetimeDependenceKind = .borrow
       descriptorExpr = borrowExpr.expression
     } else if let inoutExpr = node.as(InOutExprSyntax.self) {
       lifetimeDependenceKind = .inout

lib/Parse/ParseDecl.cpp

@@ -5017,7 +5017,7 @@ ParserResult<LifetimeEntry> Parser::parseLifetimeEntry(SourceLoc loc) {
     if (Tok.isContextualKeyword("borrow") &&
         peekToken().isAny(tok::identifier, tok::integer_literal,
                           tok::kw_self)) {
-      return ParsedLifetimeDependenceKind::Scope;
+      return ParsedLifetimeDependenceKind::Borrow;
     }
     if (Tok.is(tok::amp_prefix) &&
         peekToken().isAny(tok::identifier, tok::integer_literal,