Author: Qinkun Bao Date: 2025-06-02T17:08:04-04:00 New Revision: d313c09b288c31f93819408048b0b64ca5c5fc2b
URL: https://github.com/llvm/llvm-project/commit/d313c09b288c31f93819408048b0b64ca5c5fc2b DIFF: https://github.com/llvm/llvm-project/commit/d313c09b288c31f93819408048b0b64ca5c5fc2b.diff LOG: [UBSan][Ignorelist] Expanding =sanitize to fun. (#142074) See https://github.com/llvm/llvm-project/issues/139128 If multiple entries match the source, than the latest entry takes the precedence. --------- Co-authored-by: Copilot <175728472+copi...@users.noreply.github.com> Added: clang/test/CodeGen/ubsan-function-ignorelist.test Modified: clang/lib/Basic/NoSanitizeList.cpp Removed: ################################################################################ diff --git a/clang/lib/Basic/NoSanitizeList.cpp b/clang/lib/Basic/NoSanitizeList.cpp index a1ca31ea0e970..ba36f78175422 100644 --- a/clang/lib/Basic/NoSanitizeList.cpp +++ b/clang/lib/Basic/NoSanitizeList.cpp @@ -54,7 +54,7 @@ bool NoSanitizeList::containsType(SanitizerMask Mask, StringRef MangledTypeName, bool NoSanitizeList::containsFunction(SanitizerMask Mask, StringRef FunctionName) const { - return SSCL->inSection(Mask, "fun", FunctionName); + return containsPrefix(Mask, "fun", FunctionName, {}); } bool NoSanitizeList::containsFile(SanitizerMask Mask, StringRef FileName, diff --git a/clang/test/CodeGen/ubsan-function-ignorelist.test b/clang/test/CodeGen/ubsan-function-ignorelist.test new file mode 100644 index 0000000000000..311b2ffd7f737 --- /dev/null +++ b/clang/test/CodeGen/ubsan-function-ignorelist.test @@ -0,0 +1,83 @@ +// 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 --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, then the latest entry takes the +// precedence. + + +//--- order-0.ignorelist +fun:add +fun:add=sanitize + +//--- order-1.ignorelist +fun:add=sanitize +fun:add + +//--- order-2.ignorelist +fun:ad* +fun:add=sanitize + +//--- order-3.ignorelist +fun:ad*=sanitize +fun:add + +//--- order-4.ignorelist +fun:add +fun:ad*=sanitize + +//--- order-5.ignorelist +fun:add=sanitize +fun:ad* + +//--- order-6.ignorelist +fun:add +fun:add=sanitize +fun:a*d +fun:*dd=sanitize + +//--- order-7.ignorelist +[{unsigned-integer-overflow,signed-integer-overflow}] +fun:* +fun:add=sanitize +fun:a*d +fun:*dd=sanitize +[{unsigned-integer-overflow,signed-integer-overflow}] +fun:* +fun:add +fun:a*d=sanitize +fun:*d + +//--- order-8.ignorelist +[{unsigned-integer-overflow,signed-integer-overflow}] +fun:* +fun:add +fun:a*d=sanitize +fun:*dd +[{unsigned-integer-overflow,signed-integer-overflow}] +fun:* +fun:add=sanitize +fun:a*d +fun:*dd=sanitize + + +//--- test.c +// CHECK-LABEL: define dso_local void @add +void add(int A) { +// IGNORE: %inc = add nsw +// SANITIZE: @llvm.sadd.with.overflow.i32 + ++A; +} + _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
