llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Qinkun Bao (qinkunbao) <details> <summary>Changes</summary> --- Full diff: https://github.com/llvm/llvm-project/pull/142006.diff 2 Files Affected: - (modified) clang/lib/AST/ASTContext.cpp (+1-2) - (modified) clang/lib/Basic/NoSanitizeList.cpp (+5-1) ``````````diff 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, `````````` </details> https://github.com/llvm/llvm-project/pull/142006 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
