fix: ci

Author: woruyu

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: failed to parse malformed sanitizer ignorelist: '{{.*}}.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 load sanitizer ignorelist 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:

llvm/include/llvm/Support/SpecialCaseList.h

@@ -72,10 +72,15 @@ class SpecialCaseList {
 public:
   static constexpr std::pair<unsigned, unsigned> NotFound = {0, 0};
   /// Parses the special case list entries from files. On failure, returns
-  /// 0 and writes an error message to string.
+  /// std::pair Error, Error.first is error enum, Error.second is error message.
   LLVM_ABI static std::unique_ptr<SpecialCaseList>
   create(const std::vector<std::string> &Paths, llvm::vfs::FileSystem &FS,
          std::pair<unsigned, std::string> &Error);
+  /// Parses the special case list entries from files. On failure, returns
+  /// 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);
   /// 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>

llvm/lib/Support/SpecialCaseList.cpp

@@ -87,6 +87,20 @@ SpecialCaseList::create(const std::vector<std::string> &Paths,
   return nullptr;
 }
 
+std::unique_ptr<SpecialCaseList>
+SpecialCaseList::create(const std::vector<std::string> &Paths,
+                        llvm::vfs::FileSystem &FS, std::string &Error) {
+  std::pair<unsigned, std::string> Err;
+  std::unique_ptr<SpecialCaseList> SCL = create(Paths, FS, Err);
+  if (!SCL) {
+    assert(Err.first == 0 || Err.first == 1 && "Unexpected error kind");
+    const char *Prefix =
+        Err.first == 0 ? "can't open file " : "error parsing file ";
+    Error = (Twine(Prefix) + Err.second).str();
+  }
+  return SCL;
+}
+
 std::unique_ptr<SpecialCaseList> SpecialCaseList::create(const MemoryBuffer *MB,
                                                          std::string &Error) {
   std::unique_ptr<SpecialCaseList> SCL(new SpecialCaseList());
@@ -113,13 +127,13 @@ bool SpecialCaseList::createInternal(const std::vector<std::string> &Paths,
         VFS.getBufferForFile(Path);
     if (std::error_code EC = FileOrErr.getError()) {
       Error.first = 0 /* open failure */;
-      Error.second = (Twine(Path) + "': " + EC.message()).str();
+      Error.second = (Twine("'") + Path + "': " + EC.message()).str();
       return false;
     }
     std::string ParseError;
     if (!parse(i, FileOrErr.get().get(), ParseError)) {
       Error.first = 1 /* parse failure */;
-      Error.second = (Twine(Path) + "': " + ParseError).str();
+      Error.second = (Twine("'") + Path + "': " + ParseError).str();
       return false;
     }
   }