Merge pull request #71147 from meg-gupta/lifetimedependencelangattrfollowup

Follow up for C++ parser changes in #71069

Author: meg-gupta

include/swift/AST/DiagnosticsParse.def

@@ -2173,11 +2173,11 @@ ERROR(expected_lparen_after_lifetime_dependence, PointsToFirstBadToken,
 
 ERROR(expected_identifier_or_index_or_self_after_lifetime_dependence,
       PointsToFirstBadToken,
-      "expected identifier or index or self in lifetime dependence specifier",
+      "expected identifier, index or self in lifetime dependence specifier",
       ())
 
 ERROR(expected_rparen_after_lifetime_dependence, PointsToFirstBadToken,
-      "expected ')' after param list in lifetime dependence specifier", ())
+      "expected ')' after parameter list in lifetime dependence specifier", ())
 
 ERROR(expected_param_index_lifetime_dependence, PointsToFirstBadToken,
       "expected unsigned parameter index in lifetime dependence specifier", ())

include/swift/Parse/Token.h

@@ -267,10 +267,9 @@ class Token {
     return MultilineString;
   }
 
-  bool isLifetimeDependenceToken() {
-    auto tokenRawText = getRawText();
-    return tokenRawText.equals("_copy") || tokenRawText.equals("_consume") ||
-           tokenRawText.equals("_borrow") || tokenRawText.equals("_mutate");
+  bool isLifetimeDependenceToken() const {
+    return isContextualKeyword("_copy") || isContextualKeyword("_consume") ||
+           isContextualKeyword("_borrow") || isContextualKeyword("_mutate");
   }
 
   /// Count of extending escaping '#'.

lib/Parse/ParseDecl.cpp

@@ -4950,7 +4950,6 @@ ParserStatus Parser::parseLifetimeDependenceSpecifiers(
             if (parseUnsignedInteger(
                     paramNum, paramLoc,
                     diag::expected_param_index_lifetime_dependence)) {
-              skipUntil(tok::r_paren);
               listStatus.setIsParseError();
               return listStatus;
             }
@@ -4972,7 +4971,6 @@ ParserStatus Parser::parseLifetimeDependenceSpecifiers(
                 Tok,
                 diag::
                     expected_identifier_or_index_or_self_after_lifetime_dependence);
-            skipUntil(tok::r_paren);
             listStatus.setIsParseError();
             return listStatus;
           }

test/Parse/explicit_lifetime_dependence_specifiers.swift

@@ -85,11 +85,11 @@ func invalidSpecifier1(_ x: borrowing BufferView) -> _borrow BufferView { // exp
   return BufferView(x.ptr)
 }
 
-func invalidSpecifier2(_ x: borrowing BufferView) -> _borrow() BufferView {// expected-error{{expected identifier or index or self in lifetime dependence specifier}}
+func invalidSpecifier2(_ x: borrowing BufferView) -> _borrow() BufferView {// expected-error{{expected identifier, index or self in lifetime dependence specifier}}
   return BufferView(x.ptr)
 }
 
-func invalidSpecifier3(_ x: borrowing BufferView) -> _borrow(*) BufferView { // expected-error{{expected identifier or index or self in lifetime dependence specifier}}
+func invalidSpecifier3(_ x: borrowing BufferView) -> _borrow(*) BufferView { // expected-error{{expected identifier, index or self in lifetime dependence specifier}}
   return BufferView(x.ptr)
 } 
 

test/Sema/explicit_lifetime_dependence_specifiers.swift

@@ -78,10 +78,15 @@ func inoutParamInvalidLifetimeDependence2(_ x: inout BufferView) -> _borrow(x) B
   return BufferView(x.ptr)
 }
 
-func invalidSpecifierPosition(_ x: borrowing _borrow(x) BufferView) -> BufferView { // expected-error{{lifetime dependence specifiers may only be used on result of functions, methods, initializers}}
+func invalidSpecifierPosition1(_ x: borrowing _borrow(x) BufferView) -> BufferView { // expected-error{{lifetime dependence specifiers may only be used on result of functions, methods, initializers}}
   return BufferView(x.ptr)
 }
 
+func invalidSpecifierPosition2(_ x: borrowing BufferView) -> BufferView { 
+  let y: _borrow(x) x // expected-error{{lifetime dependence specifiers may only be used on result of functions, methods, initializers}}
+  return BufferView(y.ptr)
+}
+
 struct Wrapper : ~Escapable {
   let view: BufferView
   borrowing func getView1() -> _borrow(self) BufferView {