[AST/Sema] Replace @execution(concurrent) with @concurrent

Author: xedin

include/swift/AST/ASTBridging.h

@@ -911,7 +911,6 @@ SWIFT_NAME("BridgedAvailableAttr.setIsGroupTerminator(self:)")
 void BridgedAvailableAttr_setIsGroupTerminator(BridgedAvailableAttr cAttr);
 
 enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedExecutionKind {
-  BridgedExecutionKindConcurrent,
   BridgedExecutionKindCaller,
 };
 
@@ -2591,7 +2590,6 @@ BridgedConventionTypeAttr BridgedConventionTypeAttr_createParsed(
     BridgedStringRef cClangType, BridgedSourceLoc cClangTypeLoc);
 
 enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedExecutionTypeAttrExecutionKind {
-  BridgedExecutionTypeAttrExecutionKind_Concurrent,
   BridgedExecutionTypeAttrExecutionKind_Caller
 };
 

include/swift/AST/AttrKind.h

@@ -131,8 +131,7 @@ enum : unsigned { NumExternKindBits =
   countBitsUsed(static_cast<unsigned>(ExternKind::Last_ExternKind)) };
 
 enum class ExecutionKind : uint8_t {
-  Concurrent = 0,
-  Caller,
+  Caller = 0,
   Last_ExecutionKind = Caller
 };
 

lib/AST/ASTDumper.cpp

@@ -620,8 +620,6 @@ static StringRef getDumpString(FunctionRefInfo::ApplyLevel applyLevel) {
 }
 static StringRef getDumpString(ExecutionKind kind) {
   switch (kind) {
-  case ExecutionKind::Concurrent:
-    return "concurrent";
   case ExecutionKind::Caller:
     return "caller";
   }

lib/AST/Attr.cpp

@@ -313,9 +313,6 @@ void ExecutionTypeAttr::printImpl(ASTPrinter &printer,
   printer.printAttrName("@execution");
   printer << "(";
   switch (getBehavior()) {
-  case ExecutionKind::Concurrent:
-    printer << "concurrent";
-    break;
   case ExecutionKind::Caller:
     printer << "caller";
     break;
@@ -1725,9 +1722,6 @@ bool DeclAttribute::printImpl(ASTPrinter &Printer, const PrintOptions &Options,
   case DeclAttrKind::Execution: {
     auto *attr = cast<ExecutionAttr>(this);
     switch (attr->getBehavior()) {
-    case ExecutionKind::Concurrent:
-      Printer << "@execution(concurrent)";
-      break;
     case ExecutionKind::Caller:
       Printer << "@execution(caller)";
       break;
@@ -1958,8 +1952,6 @@ StringRef DeclAttribute::getAttrName() const {
     return "lifetime";
   case DeclAttrKind::Execution: {
     switch (cast<ExecutionAttr>(this)->getBehavior()) {
-    case ExecutionKind::Concurrent:
-      return "execution(concurrent)";
     case ExecutionKind::Caller:
       return "execution(caller)";
     }

lib/AST/Bridging/DeclAttributeBridging.cpp

@@ -889,8 +889,6 @@ BridgedUnavailableFromAsyncAttr BridgedUnavailableFromAsyncAttr_createParsed(
 
 static ExecutionKind unbridged(BridgedExecutionKind kind) {
   switch (kind) {
-  case BridgedExecutionKindConcurrent:
-    return ExecutionKind::Concurrent;
   case BridgedExecutionKindCaller:
     return ExecutionKind::Caller;
   }

lib/AST/Bridging/TypeAttributeBridging.cpp

@@ -94,8 +94,6 @@ BridgedExecutionTypeAttr BridgedExecutionTypeAttr_createParsed(
     BridgedSourceLoc cBehaviorLoc) {
   auto behaviorKind = [=] {
     switch (behavior) {
-    case BridgedExecutionTypeAttrExecutionKind_Concurrent:
-      return ExecutionKind::Concurrent;
     case BridgedExecutionTypeAttrExecutionKind_Caller:
       return ExecutionKind::Caller;
     }

lib/AST/Decl.cpp

@@ -8758,9 +8758,6 @@ void VarDecl::emitLetToVarNoteIfSimple(DeclContext *UseDC) const {
 
 std::optional<ExecutionKind>
 AbstractFunctionDecl::getExecutionBehavior() const {
-  if (getAttrs().hasAttribute<ConcurrentAttr>())
-    return ExecutionKind::Concurrent;
-
   auto *attr = getAttrs().getAttribute<ExecutionAttr>();
   if (!attr)
     return {};

lib/ASTGen/Sources/ASTGen/DeclAttrs.swift

@@ -371,7 +371,6 @@ extension ASTGenVisitor {
       attribute: node,
       {
         switch $0.rawText {
-        case "concurrent": return .concurrent
         case "caller": return .caller
         default: return nil
         }

lib/ASTGen/Sources/ASTGen/TypeAttrs.swift

@@ -247,7 +247,6 @@ extension ASTGenVisitor {
       attribute: node,
       {
         switch $0.rawText {
-        case "concurrent": return .concurrent
         case "caller": return .caller
         default:
           // TODO: Diagnose.

lib/Parse/ParseDecl.cpp

@@ -3950,8 +3950,7 @@ ParserStatus Parser::parseNewDeclAttribute(DeclAttributes &Attributes,
   case DeclAttrKind::Execution: {
     auto behavior = parseSingleAttrOption<ExecutionKind>(
         *this, Loc, AttrRange, AttrName, DK,
-        {{Context.Id_concurrent, ExecutionKind::Concurrent},
-         {Context.Id_caller, ExecutionKind::Caller}});
+         {{Context.Id_caller, ExecutionKind::Caller}});
     if (!behavior)
       return makeParserSuccess();
 
@@ -4766,10 +4765,7 @@ ParserStatus Parser::parseTypeAttribute(TypeOrCustomAttr &result,
 
     bool invalid = false;
     std::optional<ExecutionKind> behavior;
-    if (isIdentifier(Tok, "concurrent")) {
-      behaviorLoc = consumeToken(tok::identifier);
-      behavior = ExecutionKind::Concurrent;
-    } else if (isIdentifier(Tok, "caller")) {
+    if (isIdentifier(Tok, "caller")) {
       behaviorLoc = consumeToken(tok::identifier);
       behavior = ExecutionKind::Caller;
     } else {