Basics: only allow ASTContext to add block list path

Author: nkcsgexi

include/swift/Basic/BlockList.h

@@ -23,7 +23,7 @@
 
 namespace swift {
 
-enum class BlockListAction : uint8_t {
+enum class BlockListAction: uint8_t {
   ShouldUseBinaryModule = 0,
   ShouldUseTextualModule,
 };
@@ -38,10 +38,11 @@ class BlockListStore {
   struct Implementation;
   bool hasBlockListAction(StringRef key, BlockListKeyKind keyKind,
                           BlockListAction action);
-  void addConfigureFilePath(StringRef path);
   BlockListStore();
   ~BlockListStore();
 private:
+  friend class ASTContext;
+  void addConfigureFilePath(StringRef path);
   Implementation &Impl;
 };
 

lib/Basic/BlockList.cpp

@@ -10,9 +10,16 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/StringSwitch.h"
+#include "llvm/Support/YAMLParser.h"
+#include "llvm/Support/YAMLTraits.h"
 #include "swift/Basic/BlockList.h"
+#include "swift/Basic/SourceManager.h"
 
 struct swift::BlockListStore::Implementation {
+  llvm::StringMap<std::vector<BlockListAction>> ModuleActionDict;
+  llvm::StringMap<std::vector<BlockListAction>> ProjectActionDict;
   void addConfigureFilePath(StringRef path);
   bool hasBlockListAction(StringRef key, BlockListKeyKind keyKind,
                           BlockListAction action);
@@ -33,7 +40,12 @@ void swift::BlockListStore::addConfigureFilePath(StringRef path) {
 
 bool swift::BlockListStore::Implementation::hasBlockListAction(StringRef key,
     BlockListKeyKind keyKind, BlockListAction action) {
-  return false;
+  auto *dict = keyKind == BlockListKeyKind::ModuleName ? &ModuleActionDict :
+    &ProjectActionDict;
+  auto it = dict->find(key);
+  if (it == dict->end())
+    return false;
+  return llvm::is_contained(it->second, action);
 }
 
 void swift::BlockListStore::Implementation::addConfigureFilePath(StringRef path) {