Merge pull request #73663 from DougGregor/concurrency-now-with-availability-6.0

DougGregor · web-flow · commit 0625b284fb2b · 2024-05-16T06:41:14.000-07:00
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
@@ -470,13 +470,6 @@ static void SaveModuleInterfaceArgs(ModuleInterfaceOptions &Opts,
     interleave(RenderedArgs,
                [&](const char *Argument) { PrintArg(OS, Argument, StringRef()); },
                [&] { OS << " "; });
-
-    // Backward-compatibility hack: disable availability checking in the
-    // _Concurrency module, so that older (Swift 5.5) compilers that did not
-    // support back deployment of concurrency do not complain about 'async'
-    // with older availability.
-    if (FOpts.ModuleName == "_Concurrency")
-      OS << " -disable-availability-checking";
   }
   {
     llvm::raw_string_ostream OS(Opts.IgnorablePrivateFlags);

Original file line number	Diff line number	Diff line change
`@@ -470,13 +470,6 @@ static void SaveModuleInterfaceArgs(ModuleInterfaceOptions &Opts,`
`470`	`470`	`interleave(RenderedArgs,`
`471`	`471`	`[&](const char *Argument) { PrintArg(OS, Argument, StringRef()); },`
`472`	`472`	`[&] { OS << " "; });`
`473`		`-`
`474`		`- // Backward-compatibility hack: disable availability checking in the`
`475`		`- // _Concurrency module, so that older (Swift 5.5) compilers that did not`
`476`		`- // support back deployment of concurrency do not complain about 'async'`
`477`		`- // with older availability.`
`478`		`- if (FOpts.ModuleName == "_Concurrency")`
`479`		`- OS << " -disable-availability-checking";`
`480`	`473`	`}`
`481`	`474`	`{`
`482`	`475`	`llvm::raw_string_ostream OS(Opts.IgnorablePrivateFlags);`