fix: review

Author: woruyu

clang/include/clang/AST/ASTContext.h

@@ -634,6 +634,8 @@ class ASTContext : public RefCountedBase<ASTContext> {
   void setRelocationInfoForCXXRecord(const CXXRecordDecl *,
                                      CXXRecordDeclRelocationInfo);
 
+  void initSanitizers(const LangOptions &LangOpts, SourceManager &SM);
+
   /// Examines a given type, and returns whether the type itself
   /// is address discriminated, or any transitively embedded types
   /// contain data that is address discriminated. This includes

clang/include/clang/Basic/NoSanitizeList.h

@@ -33,9 +33,9 @@ class NoSanitizeList {
                       StringRef Category) const;
 
 public:
-  NoSanitizeList(const std::vector<std::string> &NoSanitizeListPaths,
-                 SourceManager &SM);
+  NoSanitizeList(SourceManager &SM);
   ~NoSanitizeList();
+  bool init(const std::vector<std::string> &Paths, std::string &Error);
   bool containsGlobal(SanitizerMask Mask, StringRef GlobalName,
                       StringRef Category = StringRef()) const;
   bool containsType(SanitizerMask Mask, StringRef MangledTypeName,

clang/include/clang/Basic/SanitizerSpecialCaseList.h

@@ -37,10 +37,6 @@ class SanitizerSpecialCaseList : public llvm::SpecialCaseList {
   create(const std::vector<std::string> &Paths, llvm::vfs::FileSystem &VFS,
          std::string &Error);
 
-  static std::unique_ptr<SanitizerSpecialCaseList>
-  createOrDie(const std::vector<std::string> &Paths, llvm::vfs::FileSystem &VFS,
-              DiagnosticsEngine &Diags);
-
   // Query ignorelisted entries if any bit in Mask matches the entry's section.
   bool inSection(SanitizerMask Mask, StringRef Prefix, StringRef Query,
                  StringRef Category = StringRef()) const;

clang/lib/AST/ASTContext.cpp

@@ -50,6 +50,7 @@
 #include "clang/Basic/AddressSpaces.h"
 #include "clang/Basic/Builtins.h"
 #include "clang/Basic/CommentOptions.h"
+#include "clang/Basic/DiagnosticFrontend.h"
 #include "clang/Basic/ExceptionSpecificationType.h"
 #include "clang/Basic/IdentifierTable.h"
 #include "clang/Basic/LLVM.h"
@@ -944,7 +945,7 @@ ASTContext::ASTContext(LangOptions &LOpts, SourceManager &SM,
       DependentBitIntTypes(this_()), SubstTemplateTemplateParmPacks(this_()),
       DeducedTemplates(this_()), ArrayParameterTypes(this_()),
       CanonTemplateTemplateParms(this_()), SourceMgr(SM), LangOpts(LOpts),
-      NoSanitizeL(new NoSanitizeList(LangOpts.NoSanitizeFiles, SM)),
+      NoSanitizeL(new NoSanitizeList(SM)),
       XRayFilter(new XRayFunctionFilter(LangOpts.XRayAlwaysInstrumentFiles,
                                         LangOpts.XRayNeverInstrumentFiles,
                                         LangOpts.XRayAttrListFiles, SM)),
@@ -1697,6 +1698,15 @@ ASTContext::getRelocationInfoForCXXRecord(const CXXRecordDecl *RD) const {
   return std::nullopt;
 }
 
+void ASTContext::initSanitizers(const LangOptions &LangOpts,
+                                SourceManager &SM) {
+  std::string Error;
+  if (!NoSanitizeL->init(LangOpts.NoSanitizeFiles, Error)) {
+    const std::string &Path = LangOpts.NoSanitizeFiles.front();
+    SM.getDiagnostics().Report(diag::err_fe_error_reading) << Path << Error;
+  }
+}
+
 void ASTContext::setRelocationInfoForCXXRecord(
     const CXXRecordDecl *RD, CXXRecordDeclRelocationInfo Info) {
   assert(RD);

clang/lib/Basic/NoSanitizeList.cpp

@@ -19,12 +19,7 @@
 
 using namespace clang;
 
-NoSanitizeList::NoSanitizeList(const std::vector<std::string> &NoSanitizePaths,
-                               SourceManager &SM)
-    : SSCL(SanitizerSpecialCaseList::createOrDie(
-          NoSanitizePaths, SM.getFileManager().getVirtualFileSystem(),
-          SM.getDiagnostics())),
-      SM(SM) {}
+NoSanitizeList::NoSanitizeList(SourceManager &SM) : SM(SM) {}
 
 NoSanitizeList::~NoSanitizeList() = default;
 
@@ -43,6 +38,13 @@ bool NoSanitizeList::containsPrefix(SanitizerMask Mask, StringRef Prefix,
   return San == llvm::SpecialCaseList::NotFound || NoSan > San;
 }
 
+bool NoSanitizeList::init(const std::vector<std::string> &Paths,
+                          std::string &Error) {
+  SSCL = SanitizerSpecialCaseList::create(
+      Paths, SM.getFileManager().getVirtualFileSystem(), Error);
+  return SSCL != nullptr;
+}
+
 bool NoSanitizeList::containsGlobal(SanitizerMask Mask, StringRef GlobalName,
                                     StringRef Category) const {
   return containsPrefix(Mask, "global", GlobalName, Category);

clang/lib/Basic/SanitizerSpecialCaseList.cpp

@@ -28,20 +28,6 @@ SanitizerSpecialCaseList::create(const std::vector<std::string> &Paths,
   return nullptr;
 }
 
-std::unique_ptr<SanitizerSpecialCaseList>
-SanitizerSpecialCaseList::createOrDie(const std::vector<std::string> &Paths,
-                                      llvm::vfs::FileSystem &VFS,
-                                      DiagnosticsEngine &Diags) {
-  std::string Error;
-  if (auto SSCL = create(Paths, VFS, Error))
-    return SSCL;
-  unsigned DiagID = Diags.getCustomDiagID(clang::DiagnosticsEngine::Error,
-                                          "failed to load NoSanitize file: %0");
-
-  Diags.Report(DiagID) << Error;
-  exit(1);
-}
-
 void SanitizerSpecialCaseList::createSanitizerSections() {
   for (auto &S : Sections) {
     SanitizerMask Mask;

clang/lib/Frontend/CompilerInstance.cpp

@@ -554,6 +554,7 @@ void CompilerInstance::createASTContext() {
                                  PP.getBuiltinInfo(), PP.TUKind);
   Context->InitBuiltinTypes(getTarget(), getAuxTarget());
   setASTContext(Context);
+  Context->initSanitizers(getLangOpts(), PP.getSourceManager());
 }
 
 // ExternalASTSource

clang/test/Driver/fsanitize-ignorelist.c

@@ -74,7 +74,7 @@
 
 // Check that a missing file passed to -fsanitize-system-ignorelist triggers a clean error without crashing.
 // RUN: not %clang --target=x86_64-linux-gnu  -Xclang -fsanitize-system-ignorelist=%t.nonexistent %s  -c -o /dev/null 2>&1 | FileCheck %s --check-prefix=CHECK-SYSTEM-IGNORELIST-NOFILE
-// CHECK-SYSTEM-IGNORELIST-NOFILE: error: failed to load NoSanitize file: can't open file {{.*[\\/]fsanitize-ignorelist\.c\.tmp\.nonexistent}}
+// CHECK-SYSTEM-IGNORELIST-NOFILE: error: error reading '{{.*[\\/]fsanitize-ignorelist\.c\.tmp\.nonexistent}}': can't open file '{{.*[\\/]fsanitize-ignorelist\.c\.tmp\.nonexistent}}': {{[Nn]o such file or directory}}
 // CHECK-SYSTEM-IGNORELIST-NOFILE-NOT: Stack dump:
 // CHECK-SYSTEM-IGNORELIST-NOFILE-NOT: PLEASE submit a bug report
 // CHECK-SYSTEM-IGNORELIST-NOFILE-NOT: diagnostic msg: