fix: use std::pair to fix SpecialCaseList

woruyu · woruyu · commit 49447c07f533 · 2025-07-25T11:23:08.000+08:00
diff --git a/clang/include/clang/Basic/DiagnosticDriverKinds.td b/clang/include/clang/Basic/DiagnosticDriverKinds.td
@@ -252,13 +252,13 @@ def err_drv_invalid_argument_to_option : Error<
 def err_drv_missing_sanitizer_ignorelist : Error<
   "missing sanitizer ignorelist: '%0'">;
 def err_drv_malformed_sanitizer_ignorelist : Error<
-  "malformed sanitizer ignorelist: '%0'">;
+  "failed to %select{load|parse}0 malformed sanitizer ignorelist: '%1'">;
 def err_drv_malformed_sanitizer_coverage_allowlist : Error<
-  "malformed sanitizer coverage allowlist: '%0'">;
+  "failed to %select{load|parse}0 malformed sanitizer coverage allowlist: '%1'">;
 def err_drv_malformed_sanitizer_coverage_ignorelist : Error<
-  "malformed sanitizer coverage ignorelist: '%0'">;
+  "failed to %select{load|parse}0 malformed sanitizer coverage ignorelist: '%1'">;
 def err_drv_malformed_sanitizer_metadata_ignorelist : Error<
-  "malformed sanitizer metadata ignorelist: '%0'">;
+  "failed to %select{load|parse}0 malformed sanitizer metadata ignorelist: '%1'">;
 def err_drv_unsupported_static_sanitizer_darwin : Error<
   "static %0 runtime is not supported on darwin">;
 def err_drv_duplicate_config : Error<
diff --git a/clang/include/clang/Basic/DiagnosticFrontendKinds.td b/clang/include/clang/Basic/DiagnosticFrontendKinds.td
@@ -371,7 +371,7 @@ def warn_profile_data_misexpect : Warning<
   "annotation was correct on %0 of profiled executions">,
   BackendInfo, InGroup<MisExpect>;
 def err_sanitize_ignorelist_failure : Error<
-  "failed to sanitizer ignorelist file: %0">;
+  "failed to %select{load|parse}0 sanitizer ignorelist file: '%1'">;
 } // end of instrumentation issue category
 
 def err_extract_api_ignores_file_not_found :
diff --git a/clang/include/clang/Basic/NoSanitizeList.h b/clang/include/clang/Basic/NoSanitizeList.h
@@ -35,7 +35,8 @@ class NoSanitizeList {
 public:
   NoSanitizeList(SourceManager &SM);
   ~NoSanitizeList();
-  bool init(const std::vector<std::string> &Paths, std::string &Error);
+  bool init(const std::vector<std::string> &Paths,
+            std::pair<unsigned, std::string> &Error);
   bool containsGlobal(SanitizerMask Mask, StringRef GlobalName,
                       StringRef Category = StringRef()) const;
   bool containsType(SanitizerMask Mask, StringRef MangledTypeName,
diff --git a/clang/include/clang/Basic/SanitizerSpecialCaseList.h b/clang/include/clang/Basic/SanitizerSpecialCaseList.h
@@ -35,7 +35,7 @@ class SanitizerSpecialCaseList : public llvm::SpecialCaseList {
 public:
   static std::unique_ptr<SanitizerSpecialCaseList>
   create(const std::vector<std::string> &Paths, llvm::vfs::FileSystem &VFS,
-         std::string &Error);
+         std::pair<unsigned, std::string> &Error);
 
   // Query ignorelisted entries if any bit in Mask matches the entry's section.
   bool inSection(SanitizerMask Mask, StringRef Prefix, StringRef Query,
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
@@ -1700,9 +1700,10 @@ ASTContext::getRelocationInfoForCXXRecord(const CXXRecordDecl *RD) const {
 
 void ASTContext::initSanitizers(const LangOptions &LangOpts,
                                 SourceManager &SM) {
-  std::string Error;
+  std::pair<unsigned, std::string> Error;
   if (!NoSanitizeL->init(LangOpts.NoSanitizeFiles, Error)) {
-    SM.getDiagnostics().Report(diag::err_sanitize_ignorelist_failure) << Error;
+    SM.getDiagnostics().Report(diag::err_sanitize_ignorelist_failure)
+        << Error.first << Error.second;
   }
 }
 
diff --git a/clang/lib/Basic/NoSanitizeList.cpp b/clang/lib/Basic/NoSanitizeList.cpp
@@ -39,7 +39,7 @@ bool NoSanitizeList::containsPrefix(SanitizerMask Mask, StringRef Prefix,
 }
 
 bool NoSanitizeList::init(const std::vector<std::string> &Paths,
-                          std::string &Error) {
+                          std::pair<unsigned, std::string> &Error) {
   SSCL = SanitizerSpecialCaseList::create(
       Paths, SM.getFileManager().getVirtualFileSystem(), Error);
   return SSCL != nullptr;
diff --git a/clang/lib/Basic/ProfileList.cpp b/clang/lib/Basic/ProfileList.cpp
@@ -26,7 +26,7 @@ class ProfileSpecialCaseList : public llvm::SpecialCaseList {
 public:
   static std::unique_ptr<ProfileSpecialCaseList>
   create(const std::vector<std::string> &Paths, llvm::vfs::FileSystem &VFS,
-         std::string &Error);
+         std::pair<unsigned, std::string> &Error);
 
   static std::unique_ptr<ProfileSpecialCaseList>
   createOrDie(const std::vector<std::string> &Paths,
@@ -44,7 +44,8 @@ class ProfileSpecialCaseList : public llvm::SpecialCaseList {
 
 std::unique_ptr<ProfileSpecialCaseList>
 ProfileSpecialCaseList::create(const std::vector<std::string> &Paths,
-                               llvm::vfs::FileSystem &VFS, std::string &Error) {
+                               llvm::vfs::FileSystem &VFS,
+                               std::pair<unsigned, std::string> &Error) {
   auto PSCL = std::make_unique<ProfileSpecialCaseList>();
   if (PSCL->createInternal(Paths, VFS, Error))
     return PSCL;
@@ -54,10 +55,11 @@ ProfileSpecialCaseList::create(const std::vector<std::string> &Paths,
 std::unique_ptr<ProfileSpecialCaseList>
 ProfileSpecialCaseList::createOrDie(const std::vector<std::string> &Paths,
                                     llvm::vfs::FileSystem &VFS) {
-  std::string Error;
+  std::pair<unsigned, std::string> Error;
   if (auto PSCL = create(Paths, VFS, Error))
     return PSCL;
-  llvm::report_fatal_error(llvm::Twine(Error));
+  // TODO: add init function and use diagnose instead fo report_fatal_error
+  llvm::report_fatal_error(llvm::Twine(Error.second));
 }
 
 } // namespace clang
diff --git a/clang/lib/Basic/SanitizerSpecialCaseList.cpp b/clang/lib/Basic/SanitizerSpecialCaseList.cpp
@@ -18,7 +18,7 @@ using namespace clang;
 std::unique_ptr<SanitizerSpecialCaseList>
 SanitizerSpecialCaseList::create(const std::vector<std::string> &Paths,
                                  llvm::vfs::FileSystem &VFS,
-                                 std::string &Error) {
+                                 std::pair<unsigned, std::string> &Error) {
   std::unique_ptr<clang::SanitizerSpecialCaseList> SSCL(
       new SanitizerSpecialCaseList());
   if (SSCL->createInternal(Paths, VFS, Error)) {
diff --git a/clang/lib/Driver/SanitizerArgs.cpp b/clang/lib/Driver/SanitizerArgs.cpp
@@ -181,11 +181,11 @@ static void validateSpecialCaseListFormat(const Driver &D,
   if (SCLFiles.empty())
     return;
 
-  std::string BLError;
+  std::pair<unsigned, std::string> BLError;
   std::unique_ptr<llvm::SpecialCaseList> SCL(
       llvm::SpecialCaseList::create(SCLFiles, D.getVFS(), BLError));
   if (!SCL && DiagnoseErrors)
-    D.Diag(MalformedSCLErrorDiagID) << BLError;
+    D.Diag(MalformedSCLErrorDiagID) << BLError.first << BLError.second;
 }
 
 static void addDefaultIgnorelists(const Driver &D, SanitizerMask Kinds,
diff --git a/clang/test/Driver/fsanitize-ignorelist.c b/clang/test/Driver/fsanitize-ignorelist.c
@@ -50,7 +50,7 @@
 
 // Driver properly reports malformed ignorelist files.
 // RUN: not %clang --target=x86_64-linux-gnu -fsanitize=address -fsanitize-ignorelist=%t.second -fsanitize-ignorelist=%t.bad -fsanitize-ignorelist=%t.good %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-BAD-IGNORELIST
-// CHECK-BAD-IGNORELIST: error: malformed sanitizer ignorelist: 'error parsing file '{{.*}}.bad': malformed line 1: 'badline''
+// CHECK-BAD-IGNORELIST: error: failed to parse malformed sanitizer ignorelist: '{{.*}}.bad': malformed line 1: 'badline'
 
 // -fno-sanitize-ignorelist disables all ignorelists specified earlier.
 // RUN: %clang --target=x86_64-linux-gnu -fsanitize=address -fsanitize-ignorelist=%t.good -fno-sanitize-ignorelist -fsanitize-ignorelist=%t.second %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-ONLY-FIRST-DISABLED --implicit-check-not=-fsanitize-ignorelist=
@@ -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 sanitizer ignorelist file: can't open file '{{.*[\\/]fsanitize-ignorelist\.c\.tmp\.nonexistent}}': {{[Nn]o such file or directory}}
+// CHECK-SYSTEM-IGNORELIST-NOFILE: error: failed to load sanitizer ignorelist 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:
diff --git a/llvm/include/llvm/Support/SpecialCaseList.h b/llvm/include/llvm/Support/SpecialCaseList.h
@@ -75,7 +75,7 @@ class SpecialCaseList {
   /// 0 and writes an error message to string.
   LLVM_ABI static std::unique_ptr<SpecialCaseList>
   create(const std::vector<std::string> &Paths, llvm::vfs::FileSystem &FS,
-         std::string &Error);
+         std::pair<unsigned, std::string> &Error);
   /// Parses the special case list from a memory buffer. On failure, returns
   /// 0 and writes an error message to string.
   LLVM_ABI static std::unique_ptr<SpecialCaseList>
@@ -111,7 +111,8 @@ class SpecialCaseList {
   // Implementations of the create*() functions that can also be used by derived
   // classes.
   LLVM_ABI bool createInternal(const std::vector<std::string> &Paths,
-                               vfs::FileSystem &VFS, std::string &Error);
+                               vfs::FileSystem &VFS,
+                               std::pair<unsigned, std::string> &Error);
   LLVM_ABI bool createInternal(const MemoryBuffer *MB, std::string &Error);
 
   SpecialCaseList() = default;
diff --git a/llvm/lib/Support/SpecialCaseList.cpp b/llvm/lib/Support/SpecialCaseList.cpp
@@ -79,7 +79,8 @@ unsigned SpecialCaseList::Matcher::match(StringRef Query) const {
 // TODO: Refactor this to return Expected<...>
 std::unique_ptr<SpecialCaseList>
 SpecialCaseList::create(const std::vector<std::string> &Paths,
-                        llvm::vfs::FileSystem &FS, std::string &Error) {
+                        llvm::vfs::FileSystem &FS,
+                        std::pair<unsigned, std::string> &Error) {
   std::unique_ptr<SpecialCaseList> SCL(new SpecialCaseList());
   if (SCL->createInternal(Paths, FS, Error))
     return SCL;
@@ -97,25 +98,28 @@ std::unique_ptr<SpecialCaseList> SpecialCaseList::create(const MemoryBuffer *MB,
 std::unique_ptr<SpecialCaseList>
 SpecialCaseList::createOrDie(const std::vector<std::string> &Paths,
                              llvm::vfs::FileSystem &FS) {
-  std::string Error;
+  std::pair<unsigned, std::string> Error;
   if (auto SCL = create(Paths, FS, Error))
     return SCL;
-  report_fatal_error(Twine(Error));
+  report_fatal_error(Twine(Error.second));
 }
 
 bool SpecialCaseList::createInternal(const std::vector<std::string> &Paths,
-                                     vfs::FileSystem &VFS, std::string &Error) {
+                                     vfs::FileSystem &VFS,
+                                     std::pair<unsigned, std::string> &Error) {
   for (size_t i = 0; i < Paths.size(); ++i) {
     const auto &Path = Paths[i];
     ErrorOr<std::unique_ptr<MemoryBuffer>> FileOrErr =
         VFS.getBufferForFile(Path);
     if (std::error_code EC = FileOrErr.getError()) {
-      Error = (Twine("can't open file '") + Path + "': " + EC.message()).str();
+      Error.first = 0 /* open failure */;
+      Error.second = (Twine(Path) + "': " + EC.message()).str();
       return false;
     }
     std::string ParseError;
     if (!parse(i, FileOrErr.get().get(), ParseError)) {
-      Error = (Twine("error parsing file '") + Path + "': " + ParseError).str();
+      Error.first = 1 /* parse failure */;
+      Error.second = (Twine(Path) + "': " + ParseError).str();
       return false;
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -1700,9 +1700,10 @@ ASTContext::getRelocationInfoForCXXRecord(const CXXRecordDecl *RD) const {`
`1700`	`1700`
`1701`	`1701`	`void ASTContext::initSanitizers(const LangOptions &LangOpts,`
`1702`	`1702`	`SourceManager &SM) {`
`1703`		`- std::string Error;`
	`1703`	`+ std::pair<unsigned, std::string> Error;`
`1704`	`1704`	`if (!NoSanitizeL->init(LangOpts.NoSanitizeFiles, Error)) {`
`1705`		`- SM.getDiagnostics().Report(diag::err_sanitize_ignorelist_failure) << Error;`
	`1705`	`+ SM.getDiagnostics().Report(diag::err_sanitize_ignorelist_failure)`
	`1706`	`+ << Error.first << Error.second;`
`1706`	`1707`	`}`
`1707`	`1708`	`}`
`1708`	`1709`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ bool NoSanitizeList::containsPrefix(SanitizerMask Mask, StringRef Prefix,`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`bool NoSanitizeList::init(const std::vector<std::string> &Paths,`
`42`		`- std::string &Error) {`
	`42`	`+ std::pair<unsigned, std::string> &Error) {`
`43`	`43`	`SSCL = SanitizerSpecialCaseList::create(`
`44`	`44`	`Paths, SM.getFileManager().getVirtualFileSystem(), Error);`
`45`	`45`	`return SSCL != nullptr;`