[Concurrency] Rename -enable-experimental-async.

Use the more general name `-enable-experimental-concurrency` instead,
since async is one part of the model.

Author: DougGregor

include/swift/Basic/LangOptions.h

@@ -235,8 +235,8 @@ namespace swift {
     /// Enable experimental #assert feature.
     bool EnableExperimentalStaticAssert = false;
 
-    /// Enable experimental async concurrency model.
-    bool EnableExperimentalAsync = false;
+    /// Enable experimental concurrency model.
+    bool EnableExperimentalConcurrency = false;
 
     /// Should we check the target OSs of serialized modules to see that they're
     /// new enough?

include/swift/Option/FrontendOptions.td

@@ -381,9 +381,9 @@ def enable_experimental_static_assert :
   Flag<["-"], "enable-experimental-static-assert">,
   HelpText<"Enable experimental #assert">;
 
-def enable_experimental_async :
-  Flag<["-"], "enable-experimental-async">,
-  HelpText<"Enable experimental async concurrency">;
+def enable_experimental_concurrency :
+  Flag<["-"], "enable-experimental-concurrency">,
+  HelpText<"Enable experimental concurrency model">;
 
 def enable_subst_sil_function_types_for_function_values :
   Flag<["-"], "enable-subst-sil-function-types-for-function-values">,

lib/Frontend/CompilerInvocation.cpp

@@ -373,8 +373,8 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
   Opts.EnableExperimentalStaticAssert |=
     Args.hasArg(OPT_enable_experimental_static_assert);
 
-  Opts.EnableExperimentalAsync |=
-    Args.hasArg(OPT_enable_experimental_async);
+  Opts.EnableExperimentalConcurrency |=
+    Args.hasArg(OPT_enable_experimental_concurrency);
 
   Opts.EnableSubstSILFunctionTypesForFunctionValues |=
     Args.hasArg(OPT_enable_subst_sil_function_types_for_function_values);

lib/Parse/ParseExpr.cpp

@@ -330,7 +330,7 @@ ParserResult<Expr> Parser::parseExprSequence(Diag<> Message,
     case tok::identifier: {
       // 'async' followed by 'throws' or '->' implies that we have an arrow
       // expression.
-      if (!(Context.LangOpts.EnableExperimentalAsync &&
+      if (!(Context.LangOpts.EnableExperimentalConcurrency &&
             Tok.isContextualKeyword("async") &&
             peekToken().isAny(tok::arrow, tok::kw_throws)))
         goto done;

lib/Parse/ParsePattern.cpp

@@ -786,7 +786,7 @@ Parser::parseFunctionSignature(Identifier SimpleName,
   FullName = DeclName(Context, SimpleName, NamePieces);
 
   // Check for the 'async' keyword.
-  if (Context.LangOpts.EnableExperimentalAsync &&
+  if (Context.LangOpts.EnableExperimentalConcurrency &&
       Tok.isContextualKeyword("async")) {
     asyncLoc = consumeToken();
   }
@@ -831,7 +831,7 @@ Parser::parseFunctionSignature(Identifier SimpleName,
 void Parser::parseAsyncThrows(
     SourceLoc existingArrowLoc, SourceLoc &asyncLoc, SourceLoc &throwsLoc,
     bool *rethrows) {
-  if (Context.LangOpts.EnableExperimentalAsync &&
+  if (Context.LangOpts.EnableExperimentalConcurrency &&
       Tok.isContextualKeyword("async")) {
     asyncLoc = consumeToken();
 
@@ -864,7 +864,7 @@ void Parser::parseAsyncThrows(
         .fixItInsert(existingArrowLoc, (keyword + " ").str());
     }
 
-    if (Context.LangOpts.EnableExperimentalAsync &&
+    if (Context.LangOpts.EnableExperimentalConcurrency &&
         Tok.isContextualKeyword("async")) {
       asyncLoc = consumeToken();
 

lib/Parse/ParseType.cpp

@@ -412,7 +412,7 @@ ParserResult<TypeRepr> Parser::parseType(Diag<> MessageID,
 
   // Parse an async specifier.
   SourceLoc asyncLoc;
-  if (Context.LangOpts.EnableExperimentalAsync &&
+  if (Context.LangOpts.EnableExperimentalConcurrency &&
       Tok.isContextualKeyword("async")) {
     asyncLoc = consumeToken();
   }
@@ -423,7 +423,7 @@ ParserResult<TypeRepr> Parser::parseType(Diag<> MessageID,
   SourceLoc throwsLoc;
   if (Tok.isAny(tok::kw_throws, tok::kw_rethrows, tok::kw_throw, tok::kw_try) &&
       (peekToken().is(tok::arrow) ||
-       (Context.LangOpts.EnableExperimentalAsync &&
+       (Context.LangOpts.EnableExperimentalConcurrency &&
         peekToken().isContextualKeyword("async")))) {
     if (Tok.isAny(tok::kw_rethrows, tok::kw_throw, tok::kw_try)) {
       // 'rethrows' is only allowed on function declarations for now.
@@ -436,7 +436,7 @@ ParserResult<TypeRepr> Parser::parseType(Diag<> MessageID,
     throwsLoc = consumeToken();
 
     // 'async' must preceed 'throws'; accept this but complain.
-    if (Context.LangOpts.EnableExperimentalAsync &&
+    if (Context.LangOpts.EnableExperimentalConcurrency &&
         Tok.isContextualKeyword("async")) {
       asyncLoc = consumeToken();
 
@@ -1587,7 +1587,7 @@ bool Parser::canParseType() {
   }
 
   // Handle type-function if we have an 'async'.
-  if (Context.LangOpts.EnableExperimentalAsync &&
+  if (Context.LangOpts.EnableExperimentalConcurrency &&
       Tok.isContextualKeyword("async")) {
     consumeToken();
 
@@ -1603,7 +1603,7 @@ bool Parser::canParseType() {
 
     // Allow 'async' here even though it is ill-formed, so we can provide
     // a better error.
-    if (Context.LangOpts.EnableExperimentalAsync &&
+    if (Context.LangOpts.EnableExperimentalConcurrency &&
         Tok.isContextualKeyword("async"))
       consumeToken();
 

test/Constraints/async.swift

@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-async
+// RUN: %target-typecheck-verify-swift -enable-experimental-concurrency
 
 func doAsynchronously() async { }
 func doSynchronously() { }

test/IRGen/async.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -primary-file %s -emit-ir -enable-experimental-async | %FileCheck %s
+// RUN: %target-swift-frontend -primary-file %s -emit-ir -enable-experimental-concurrency | %FileCheck %s
 
 // CHECK: "$s5async1fyyYF"
 public func f() async { }

test/Parse/async.swift

@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-async
+// RUN: %target-typecheck-verify-swift -enable-experimental-concurrency
 
 // Parsing function declarations with 'async'
 func asyncGlobal1() async { }

test/Runtime/demangleToMetadata.swift

@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-build-swift -Xfrontend -enable-experimental-async -parse-stdlib %s -module-name main -o %t/a.out
+// RUN: %target-build-swift -Xfrontend -enable-experimental-concurrency -parse-stdlib %s -module-name main -o %t/a.out
 // RUN: %target-codesign %t/a.out
 // RUN: %target-run %t/a.out
 // REQUIRES: executable_test