Merge pull request #65024 from nkcsgexi/block-list-frontend

Author: nkcsgexi

include/swift/Basic/BlockList.h

@@ -25,8 +25,8 @@ namespace swift {
 
 enum class BlockListAction: uint8_t {
   Undefined = 0,
-  ShouldUseBinaryModule,
-  ShouldUseTextualModule,
+#define BLOCKLIST_ACTION(NAME) NAME,
+#include "BlockListAction.def"
 };
 
 enum class BlockListKeyKind: uint8_t {

include/swift/Basic/BlockListAction.def

@@ -0,0 +1,25 @@
+//===--- BlockListAction.def - Define all blocklist actions -----*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2023 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+//  This definition file describes all block list actions for meta-programming
+//  purposes.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef BLOCKLIST_ACTION
+#define BLOCKLIST_ACTION(NAME)
+#endif
+
+BLOCKLIST_ACTION(ShouldUseBinaryModule)
+BLOCKLIST_ACTION(ShouldUseTextualModule)
+
+#undef BLOCKLIST_ACTION

include/swift/Basic/LangOptions.h

@@ -557,7 +557,7 @@ namespace swift {
     ConcurrencyModel ActiveConcurrencyModel = ConcurrencyModel::Standard;
 
     /// All block list configuration files to be honored in this compilation.
-    std::vector<std::string> BlocklistConfigFilePath;
+    std::vector<std::string> BlocklistConfigFilePaths;
 
     bool isConcurrencyModelTaskToThread() const {
       return ActiveConcurrencyModel == ConcurrencyModel::TaskToThread;

include/swift/Frontend/FrontendOptions.h

@@ -510,6 +510,8 @@ class FrontendOptions {
   /// textual imports
   bool EmitClangHeaderWithNonModularIncludes = false;
 
+  /// All block list configuration files to be honored in this compilation.
+  std::vector<std::string> BlocklistConfigFilePaths;
 private:
   static bool canActionEmitDependencies(ActionType);
   static bool canActionEmitReferenceDependencies(ActionType);

lib/AST/ASTContext.cpp

@@ -718,7 +718,7 @@ ASTContext::ASTContext(
   if (!OutputBackend)
     OutputBackend = llvm::makeIntrusiveRefCnt<llvm::vfs::OnDiskOutputBackend>();
   // Insert all block list config paths.
-  for (auto path: langOpts.BlocklistConfigFilePath) {
+  for (auto path: langOpts.BlocklistConfigFilePaths) {
     blockListConfig.addConfigureFilePath(path);
   }
 }

lib/Basic/BlockList.cpp

@@ -115,10 +115,8 @@ void swift::BlockListStore::Implementation::addConfigureFilePath(StringRef path)
     for (auto &pair: *dyn_cast<yaml::MappingNode>(N)) {
       std::string key = getScalaString(pair.getKey());
       auto action = llvm::StringSwitch<BlockListAction>(key)
-#define CASE(X) .Case(#X, BlockListAction::X)
-        CASE(ShouldUseBinaryModule)
-        CASE(ShouldUseTextualModule)
-#undef CASE
+#define BLOCKLIST_ACTION(X) .Case(#X, BlockListAction::X)
+#include "swift/Basic/BlockListAction.def"
         .Default(BlockListAction::Undefined);
       if (action == BlockListAction::Undefined)
         continue;

lib/Frontend/ArgsToFrontendOptionsConverter.cpp

@@ -346,6 +346,9 @@ bool ArgsToFrontendOptionsConverter::convert(
   }
   Opts.emptyABIDescriptor = Args.hasArg(OPT_empty_abi_descriptor);
   Opts.DeterministicCheck = Args.hasArg(OPT_enable_deterministic_check);
+  for (auto A : Args.getAllArgValues(options::OPT_block_list_file)) {
+    Opts.BlocklistConfigFilePaths.push_back(A);
+  }
   return false;
 }
 

lib/Frontend/CompilerInvocation.cpp

@@ -1177,9 +1177,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
 
   Opts.DumpTypeWitnessSystems = Args.hasArg(OPT_dump_type_witness_systems);
 
-  for (auto A : Args.getAllArgValues(options::OPT_block_list_file)) {
-    Opts.BlocklistConfigFilePath.push_back(A);
-  }
+  Opts.BlocklistConfigFilePaths = FrontendOpts.BlocklistConfigFilePaths;
   if (const Arg *A = Args.getLastArg(options::OPT_concurrency_model)) {
     Opts.ActiveConcurrencyModel =
         llvm::StringSwitch<ConcurrencyModel>(A->getValue())