Author: vedantk
Date: Tue Sep 12 11:58:00 2017
New Revision: 313062
URL: http://llvm.org/viewvc/llvm-project?rev=313062&view=rev
Log:
[ubsan] Extend default blacklist support to integer/nullability groups
The default blacklist should also apply when the integer or nullability
checks are enabled.
Added:
cfe/trunk/test/Driver/Inputs/resource_dir/ubsan_blacklist.txt
Modified:
cfe/trunk/lib/Driver/SanitizerArgs.cpp
cfe/trunk/test/Driver/fsanitize-blacklist.c
Modified: cfe/trunk/lib/Driver/SanitizerArgs.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/SanitizerArgs.cpp?rev=313062&r1=313061&r2=313062&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/SanitizerArgs.cpp (original)
+++ cfe/trunk/lib/Driver/SanitizerArgs.cpp Tue Sep 12 11:58:00 2017
@@ -104,7 +104,7 @@ static bool getDefaultBlacklist(const Dr
BlacklistFile = "dfsan_abilist.txt";
else if (Kinds & CFI)
BlacklistFile = "cfi_blacklist.txt";
- else if (Kinds & Undefined)
+ else if (Kinds & (Undefined | Integer | Nullability))
BlacklistFile = "ubsan_blacklist.txt";
if (BlacklistFile) {
Added: cfe/trunk/test/Driver/Inputs/resource_dir/ubsan_blacklist.txt
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/resource_dir/ubsan_blacklist.txt?rev=313062&view=auto
==============================================================================
(empty)
Modified: cfe/trunk/test/Driver/fsanitize-blacklist.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/fsanitize-blacklist.c?rev=313062&r1=313061&r2=313062&view=diff
==============================================================================
--- cfe/trunk/test/Driver/fsanitize-blacklist.c (original)
+++ cfe/trunk/test/Driver/fsanitize-blacklist.c Tue Sep 12 11:58:00 2017
@@ -23,6 +23,12 @@
// RUN: %clang -target x86_64-linux-gnu -fsanitize=address
-resource-dir=%S/Inputs/resource_dir %s -### 2>&1 | FileCheck %s
--check-prefix=CHECK-DEFAULT-BLACKLIST --implicit-check-not=fdepfile-entry
// CHECK-DEFAULT-BLACKLIST: -fsanitize-blacklist={{.*}}asan_blacklist.txt
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=integer
-resource-dir=%S/Inputs/resource_dir %s -### 2>&1 | FileCheck %s
--check-prefix=CHECK-DEFAULT-UBSAN-BLACKLIST --implicit-check-not=fdepfile-entry
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=nullability
-resource-dir=%S/Inputs/resource_dir %s -### 2>&1 | FileCheck %s
--check-prefix=CHECK-DEFAULT-UBSAN-BLACKLIST --implicit-check-not=fdepfile-entry
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=undefined
-resource-dir=%S/Inputs/resource_dir %s -### 2>&1 | FileCheck %s
--check-prefix=CHECK-DEFAULT-UBSAN-BLACKLIST --implicit-check-not=fdepfile-entry
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=alignment
-resource-dir=%S/Inputs/resource_dir %s -### 2>&1 | FileCheck %s
--check-prefix=CHECK-DEFAULT-UBSAN-BLACKLIST --implicit-check-not=fdepfile-entry
+// CHECK-DEFAULT-UBSAN-BLACKLIST:
-fsanitize-blacklist={{.*}}ubsan_blacklist.txt
+
// Ignore -fsanitize-blacklist flag if there is no -fsanitize flag.
// RUN: %clang -target x86_64-linux-gnu -fsanitize-blacklist=%t.good %s -###
2>&1 | FileCheck %s --check-prefix=CHECK-NO-SANITIZE --check-prefix=DELIMITERS
// CHECK-NO-SANITIZE-NOT: -fsanitize-blacklist
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
