https://github.com/qinkunbao updated
https://github.com/llvm/llvm-project/pull/142027
>From 3b8af2c0d05fdd1fd95facd0afe0b52bacfe5690 Mon Sep 17 00:00:00 2001
From: Qinkun Bao <qin...@google.com>
Date: Thu, 29 May 2025 19:58:08 +0000
Subject: [PATCH 1/3] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20ch?=
=?UTF-8?q?anges=20to=20main=20this=20commit=20is=20based=20on?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Created using spr 1.3.6
[skip ci]
---
clang/lib/AST/ASTContext.cpp | 3 +-
clang/lib/Basic/NoSanitizeList.cpp | 6 +-
.../ubsan-type-ignorelist-category-2.test | 59 +++++++++++++------
3 files changed, 47 insertions(+), 21 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..9f0f1c64995cb 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", MangledTypeName, Category);
+ if (NoSan == llvm::SpecialCaseList::NotFound)
+ return false;
+ auto San = SSCL->inSectionBlame(Mask, "type", MangledTypeName, "sanitize");
+ return San == llvm::SpecialCaseList::NotFound || NoSan > San;
}
bool NoSanitizeList::containsFunction(SanitizerMask Mask,
diff --git a/clang/test/CodeGen/ubsan-type-ignorelist-category-2.test
b/clang/test/CodeGen/ubsan-type-ignorelist-category-2.test
index 4b4f87326dbe5..006c8ec10eb6a 100644
--- a/clang/test/CodeGen/ubsan-type-ignorelist-category-2.test
+++ b/clang/test/CodeGen/ubsan-type-ignorelist-category-2.test
@@ -1,19 +1,22 @@
// RUN: rm -rf %t
// RUN: split-file %s %t
-// RUN: %clang_cc1 -triple x86_64-linux-gnu
-fsanitize=signed-integer-overflow,unsigned-integer-overflow
-fsanitize-ignorelist=%t/order-0.ignorelist -emit-llvm %t/test.c -o - |
FileCheck %s
-// RUN: %clang_cc1 -triple x86_64-linux-gnu
-fsanitize=signed-integer-overflow,unsigned-integer-overflow
-fsanitize-ignorelist=%t/order-1.ignorelist -emit-llvm %t/test.c -o - |
FileCheck %s
-// RUN: %clang_cc1 -triple x86_64-linux-gnu
-fsanitize=signed-integer-overflow,unsigned-integer-overflow
-fsanitize-ignorelist=%t/order-2.ignorelist -emit-llvm %t/test.c -o - |
FileCheck %s
-// RUN: %clang_cc1 -triple x86_64-linux-gnu
-fsanitize=signed-integer-overflow,unsigned-integer-overflow
-fsanitize-ignorelist=%t/order-3.ignorelist -emit-llvm %t/test.c -o - |
FileCheck %s
-// RUN: %clang_cc1 -triple x86_64-linux-gnu
-fsanitize=signed-integer-overflow,unsigned-integer-overflow
-fsanitize-ignorelist=%t/order-4.ignorelist -emit-llvm %t/test.c -o - |
FileCheck %s
-// RUN: %clang_cc1 -triple x86_64-linux-gnu
-fsanitize=signed-integer-overflow,unsigned-integer-overflow
-fsanitize-ignorelist=%t/order-5.ignorelist -emit-llvm %t/test.c -o - |
FileCheck %s
-// RUN: %clang_cc1 -triple x86_64-linux-gnu
-fsanitize=signed-integer-overflow,unsigned-integer-overflow
-fsanitize-ignorelist=%t/order-6.ignorelist -emit-llvm %t/test.c -o - |
FileCheck %s
-// RUN: %clang_cc1 -triple x86_64-linux-gnu
-fsanitize=signed-integer-overflow,unsigned-integer-overflow
-fsanitize-ignorelist=%t/order-7.ignorelist -emit-llvm %t/test.c -o - |
FileCheck %s
-
-// The same type can appear multiple times within an ignorelist. This is a test
-// to make sure "=sanitize" has priority regardless of the order in which
-// duplicate type entries appear. This is a precautionary measure; we would
-// much rather eagerly sanitize than silently forgo sanitization.
+// RUN: %clang_cc1 -triple x86_64-linux-gnu
-fsanitize=signed-integer-overflow,unsigned-integer-overflow
-fsanitize-ignorelist=%t/order-0.ignorelist -emit-llvm %t/test.c -o - |
FileCheck %s --check-prefixes=CHECK,SANITIZE
+// RUN: %clang_cc1 -triple x86_64-linux-gnu
-fsanitize=signed-integer-overflow,unsigned-integer-overflow
-fsanitize-ignorelist=%t/order-1.ignorelist -emit-llvm %t/test.c -o - |
FileCheck %s --check-prefixes=CHECK,IGNORE
+// RUN: %clang_cc1 -triple x86_64-linux-gnu
-fsanitize=signed-integer-overflow,unsigned-integer-overflow
-fsanitize-ignorelist=%t/order-2.ignorelist -emit-llvm %t/test.c -o - |
FileCheck %s --check-prefixes=CHECK,SANITIZE
+// RUN: %clang_cc1 -triple x86_64-linux-gnu
-fsanitize=signed-integer-overflow,unsigned-integer-overflow
-fsanitize-ignorelist=%t/order-3.ignorelist -emit-llvm %t/test.c -o - |
FileCheck %s --check-prefixes=CHECK,IGNORE
+// RUN: %clang_cc1 -triple x86_64-linux-gnu
-fsanitize=signed-integer-overflow,unsigned-integer-overflow
-fsanitize-ignorelist=%t/order-4.ignorelist -emit-llvm %t/test.c -o - |
FileCheck %s --check-prefixes=CHECK,SANITIZE
+// RUN: %clang_cc1 -triple x86_64-linux-gnu
-fsanitize=signed-integer-overflow,unsigned-integer-overflow
-fsanitize-ignorelist=%t/order-5.ignorelist -emit-llvm %t/test.c -o - |
FileCheck %s --check-prefixes=CHECK,IGNORE
+// RUN: %clang_cc1 -triple x86_64-linux-gnu
-fsanitize=signed-integer-overflow,unsigned-integer-overflow
-fsanitize-ignorelist=%t/order-6.ignorelist -emit-llvm %t/test.c -o - |
FileCheck %s --check-prefixes=CHECK,SANITIZE
+// RUN: %clang_cc1 -triple x86_64-linux-gnu
-fsanitize=signed-integer-overflow,unsigned-integer-overflow
-fsanitize-ignorelist=%t/order-7.ignorelist -emit-llvm %t/test.c -o - |
FileCheck %s --check-prefixes=CHECK,IGNORE
+// RUN: %clang_cc1 -triple x86_64-linux-gnu
-fsanitize=signed-integer-overflow,unsigned-integer-overflow
-fsanitize-ignorelist=%t/order-8.ignorelist -emit-llvm %t/test.c -o - |
FileCheck %s --check-prefixes=CHECK,SANITIZE
+
+
+// The same type can appear multiple times within an ignorelist. Any
``=sanitize`` type
+// entries enable sanitizer instrumentation, even if it was ignored by entries
before.
+// If multiple entries match the source, than the latest entry takes the
+// precedence.
+
//--- order-0.ignorelist
type:int
@@ -40,19 +43,39 @@ type:int=sanitize
type:in*
//--- order-6.ignorelist
+type:int
type:int=sanitize
-type:in*
//--- order-7.ignorelist
-type:int
+[{unsigned-integer-overflow,signed-integer-overflow}]
+type:*
type:int=sanitize
+type:i*t
+type:*nt=sanitize
+[{unsigned-integer-overflow,signed-integer-overflow}]
+type:*
+type:int
+type:i*t=sanitize
+type:*nt
-
+//--- order-8.ignorelist
+[{unsigned-integer-overflow,signed-integer-overflow}]
+type:*
+type:int
+type:i*t=sanitize
+type:*nt
+[{unsigned-integer-overflow,signed-integer-overflow}]
+type:*
+type:int=sanitize
+type:i*t
+type:*nt=sanitize
//--- test.c
-// CHECK-LABEL: @test
+// CHECK-LABEL: define dso_local void @test
void test(int A) {
-// CHECK: @llvm.sadd.with.overflow.i32
+// IGNORE: %inc = add nsw
+// SANITIZE: @llvm.sadd.with.overflow.i32
++A;
}
+
>From b4871ccd92c7006fa771d61dfbadeaeeaa2c170d Mon Sep 17 00:00:00 2001
From: Qinkun Bao <qin...@google.com>
Date: Thu, 29 May 2025 19:59:38 +0000
Subject: [PATCH 2/3] format.
Created using spr 1.3.6
---
clang/include/clang/Basic/NoSanitizeList.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/clang/include/clang/Basic/NoSanitizeList.h
b/clang/include/clang/Basic/NoSanitizeList.h
index 4a546351bb66d..266dfc0d217cb 100644
--- a/clang/include/clang/Basic/NoSanitizeList.h
+++ b/clang/include/clang/Basic/NoSanitizeList.h
@@ -29,8 +29,9 @@ class SanitizerSpecialCaseList;
class NoSanitizeList {
std::unique_ptr<SanitizerSpecialCaseList> SSCL;
SourceManager &SM;
- bool containsPrefix(SanitizerMask Mask,StringRef Prefix, StringRef Name,
+ bool containsPrefix(SanitizerMask Mask, StringRef Prefix, StringRef Name,
StringRef Category = StringRef()) const;
+
public:
NoSanitizeList(const std::vector<std::string> &NoSanitizeListPaths,
SourceManager &SM);
>From fa05c6e3e03fd3138e7f6bcb4b2946de7db132f3 Mon Sep 17 00:00:00 2001
From: Qinkun Bao <qin...@google.com>
Date: Thu, 29 May 2025 23:45:46 +0000
Subject: [PATCH 3/3] format
Created using spr 1.3.6
---
clang/lib/Basic/NoSanitizeList.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/clang/lib/Basic/NoSanitizeList.cpp
b/clang/lib/Basic/NoSanitizeList.cpp
index effed5990d906..6484578965f12 100644
--- a/clang/lib/Basic/NoSanitizeList.cpp
+++ b/clang/lib/Basic/NoSanitizeList.cpp
@@ -29,10 +29,12 @@ NoSanitizeList::~NoSanitizeList() = default;
bool NoSanitizeList::containsPrefix(SanitizerMask Mask, StringRef Prefix,
StringRef Name, StringRef Category) const {
- std::pair<unsigned, unsigned> NoSan = SSCL->inSectionBlame(Mask, Prefix,
Name, Category);
+ std::pair<unsigned, unsigned> NoSan =
+ SSCL->inSectionBlame(Mask, Prefix, Name, Category);
if (NoSan == llvm::SpecialCaseList::NotFound)
return false;
- std::pair<unsigned, unsigned> San = SSCL->inSectionBlame(Mask, Prefix, Name,
"sanitize");
+ std::pair<unsigned, unsigned> San =
+ SSCL->inSectionBlame(Mask, Prefix, Name, "sanitize");
return San == llvm::SpecialCaseList::NotFound || NoSan > San;
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
