https://github.com/qinkunbao created
https://github.com/llvm/llvm-project/pull/142006
None
>From c19361a169b18fada7702579cdadde99e4962e83 Mon Sep 17 00:00:00 2001
From: Qinkun Bao <qin...@google.com>
Date: Thu, 29 May 2025 18:19:07 +0000
Subject: [PATCH] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20initia?=
=?UTF-8?q?l=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Created using spr 1.3.6
---
clang/lib/AST/ASTContext.cpp | 3 +--
clang/lib/Basic/NoSanitizeList.cpp | 6 +++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index e71928ec0dc1c..5044d7c33ec3c 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -875,8 +875,7 @@ ASTContext::insertCanonicalTemplateTemplateParmDeclInternal(
bool ASTContext::isTypeIgnoredBySanitizer(const SanitizerMask &Mask,
const QualType &Ty) const {
std::string TyName =
Ty.getUnqualifiedType().getAsString(getPrintingPolicy());
- return NoSanitizeL->containsType(Mask, TyName) &&
- !NoSanitizeL->containsType(Mask, TyName, "sanitize");
+ return NoSanitizeL->containsType(Mask, TyName);
}
TargetCXXABI::Kind ASTContext::getCXXABIKind() const {
diff --git a/clang/lib/Basic/NoSanitizeList.cpp
b/clang/lib/Basic/NoSanitizeList.cpp
index a3ca463fc8efb..61ee19555c0ca 100644
--- a/clang/lib/Basic/NoSanitizeList.cpp
+++ b/clang/lib/Basic/NoSanitizeList.cpp
@@ -34,7 +34,11 @@ bool NoSanitizeList::containsGlobal(SanitizerMask Mask,
StringRef GlobalName,
bool NoSanitizeList::containsType(SanitizerMask Mask, StringRef
MangledTypeName,
StringRef Category) const {
- return SSCL->inSection(Mask, "type", MangledTypeName, Category);
+ auto NoSan = SSCL->inSectionBlame(Mask, "type", FileName, Category);
+ if (NoSan == llvm::SpecialCaseList::NotFound)
+ return false;
+ auto San = SSCL->inSectionBlame(Mask, "type", FileName, "sanitize");
+ return San == llvm::SpecialCaseList::NotFound || NoSan > San;
}
bool NoSanitizeList::containsFunction(SanitizerMask Mask,
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
