https://github.com/woruyu updated
https://github.com/llvm/llvm-project/pull/147959
>From e18ed1ac787a0571318b8cfe1d4eee023ba11fc2 Mon Sep 17 00:00:00 2001
From: woruyu <1214539...@qq.com>
Date: Thu, 10 Jul 2025 21:08:24 +0800
Subject: [PATCH 1/3] fix: replace report_fatal_error with Diags and exit
---
clang/include/clang/Basic/SanitizerSpecialCaseList.h | 5 +++--
clang/lib/Basic/NoSanitizeList.cpp | 3 ++-
clang/lib/Basic/SanitizerSpecialCaseList.cpp | 9 +++++++--
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/clang/include/clang/Basic/SanitizerSpecialCaseList.h
b/clang/include/clang/Basic/SanitizerSpecialCaseList.h
index cf7485909e409..72cdcf7c467f0 100644
--- a/clang/include/clang/Basic/SanitizerSpecialCaseList.h
+++ b/clang/include/clang/Basic/SanitizerSpecialCaseList.h
@@ -14,6 +14,7 @@
#ifndef LLVM_CLANG_BASIC_SANITIZERSPECIALCASELIST_H
#define LLVM_CLANG_BASIC_SANITIZERSPECIALCASELIST_H
+#include "clang/Basic/Diagnostic.h"
#include "clang/Basic/LLVM.h"
#include "clang/Basic/Sanitizers.h"
#include "llvm/ADT/StringRef.h"
@@ -37,8 +38,8 @@ class SanitizerSpecialCaseList : public llvm::SpecialCaseList
{
std::string &Error);
static std::unique_ptr<SanitizerSpecialCaseList>
- createOrDie(const std::vector<std::string> &Paths,
- llvm::vfs::FileSystem &VFS);
+ 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,
diff --git a/clang/lib/Basic/NoSanitizeList.cpp
b/clang/lib/Basic/NoSanitizeList.cpp
index 96f79fb2a2a29..1ae304fbd2132 100644
--- a/clang/lib/Basic/NoSanitizeList.cpp
+++ b/clang/lib/Basic/NoSanitizeList.cpp
@@ -22,7 +22,8 @@ using namespace clang;
NoSanitizeList::NoSanitizeList(const std::vector<std::string> &NoSanitizePaths,
SourceManager &SM)
: SSCL(SanitizerSpecialCaseList::createOrDie(
- NoSanitizePaths, SM.getFileManager().getVirtualFileSystem())),
+ NoSanitizePaths, SM.getFileManager().getVirtualFileSystem(),
+ SM.getDiagnostics())),
SM(SM) {}
NoSanitizeList::~NoSanitizeList() = default;
diff --git a/clang/lib/Basic/SanitizerSpecialCaseList.cpp
b/clang/lib/Basic/SanitizerSpecialCaseList.cpp
index f7bc1d5545d75..51a09b341f495 100644
--- a/clang/lib/Basic/SanitizerSpecialCaseList.cpp
+++ b/clang/lib/Basic/SanitizerSpecialCaseList.cpp
@@ -30,11 +30,16 @@ SanitizerSpecialCaseList::create(const
std::vector<std::string> &Paths,
std::unique_ptr<SanitizerSpecialCaseList>
SanitizerSpecialCaseList::createOrDie(const std::vector<std::string> &Paths,
- llvm::vfs::FileSystem &VFS) {
+ llvm::vfs::FileSystem &VFS,
+ DiagnosticsEngine &Diags) {
std::string Error;
if (auto SSCL = create(Paths, VFS, Error))
return SSCL;
- llvm::report_fatal_error(StringRef(Error));
+ unsigned DiagID = Diags.getCustomDiagID(clang::DiagnosticsEngine::Error,
+ "failed to load NoSanitize file:
%0");
+
+ Diags.Report(DiagID) << Error;
+ exit(1);
}
void SanitizerSpecialCaseList::createSanitizerSections() {
>From d90381c2ff9cc11ff3df9e513efa5e69db3c66d8 Mon Sep 17 00:00:00 2001
From: woruyu <1214539...@qq.com>
Date: Fri, 11 Jul 2025 10:29:01 +0800
Subject: [PATCH 2/3] add testcase
---
clang/test/Driver/fsanitize-ignorelist.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/clang/test/Driver/fsanitize-ignorelist.c
b/clang/test/Driver/fsanitize-ignorelist.c
index 7dd666a453198..9cb56900bd2a4 100644
--- a/clang/test/Driver/fsanitize-ignorelist.c
+++ b/clang/test/Driver/fsanitize-ignorelist.c
@@ -71,3 +71,10 @@
// CHECK-MISSING-CFI-NO-IGNORELIST-NOT: error: no such file or directory:
'{{.*}}cfi_ignorelist.txt'
// DELIMITERS: {{^ *"}}
+
+// 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 '{{.*}}.nonexistent': No 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:
>From 816fe1ec54d25e2029e4aed838d5c1626ea8b2d2 Mon Sep 17 00:00:00 2001
From: woruyu <1214539...@qq.com>
Date: Fri, 11 Jul 2025 11:30:53 +0800
Subject: [PATCH 3/3] fix: windows test error
---
clang/test/Driver/fsanitize-ignorelist.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clang/test/Driver/fsanitize-ignorelist.c
b/clang/test/Driver/fsanitize-ignorelist.c
index 9cb56900bd2a4..d41d43a13d54a 100644
--- a/clang/test/Driver/fsanitize-ignorelist.c
+++ b/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 '{{.*}}.nonexistent': No such file or directory
+// CHECK-SYSTEM-IGNORELIST-NOFILE: error: failed to load NoSanitize file:
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:
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
