Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clang/lib/Basic/NoSanitizeList.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ bool NoSanitizeList::containsFile(SanitizerMask Mask, StringRef FileName,

bool NoSanitizeList::containsMainFile(SanitizerMask Mask, StringRef FileName,
StringRef Category) const {
return SSCL->inSection(Mask, "mainfile", FileName, Category);
return containsPrefix(Mask, "mainfile", FileName, Category);
}

bool NoSanitizeList::containsLocation(SanitizerMask Mask, SourceLocation Loc,
Expand Down
21 changes: 16 additions & 5 deletions clang/test/CodeGen/sanitize-ignorelist-mainfile.c
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/// Test mainfile in a sanitizer special case list.
// RUN: rm -rf %t && split-file %s %t
// RUN: %clang_cc1 -emit-llvm -triple x86_64 -fsanitize=address,alignment %t/a.c -o - | FileCheck %s --check-prefixes=CHECK,DEFAULT
// RUN: %clang_cc1 -emit-llvm -triple x86_64 -fsanitize=address,alignment %t/a.c -o - | FileCheck %s --check-prefixes=CHECK,SANITIZE
// RUN: %clang_cc1 -emit-llvm -triple x86_64 -fsanitize=address,alignment -fsanitize-ignorelist=%t/a.list %t/a.c -o - | FileCheck %s --check-prefixes=CHECK,IGNORE
// RUN: %clang_cc1 -emit-llvm -triple x86_64 -fsanitize=address,alignment -fsanitize-ignorelist=%t/b.list %t/a.c -o - | FileCheck %s --check-prefixes=CHECK,IGNORE
// RUN: %clang_cc1 -emit-llvm -triple x86_64 -fsanitize=address,alignment -fsanitize-ignorelist=%t/c.list %t/a.c -o - | FileCheck %s --check-prefixes=CHECK,SANITIZE
// RUN: %clang_cc1 -emit-llvm -triple x86_64 -fsanitize=address,alignment -fsanitize-ignorelist=%t/d.list %t/a.c -o - | FileCheck %s --check-prefixes=CHECK,IGNORE

//--- a.list
mainfile:*a.c
Expand All @@ -14,6 +16,15 @@ mainfile:*a.c
[alignment]
mainfile:*.c

//--- c.list
mainfile:*a.c
mainfile:*a.c=sanitize

//--- d.list
mainfile:*a.c
mainfile:*a.c=sanitize
mainfile:*a.c

//--- a.h
int global_h;

Expand All @@ -30,12 +41,12 @@ int foo(void *x) {
return load(x);
}

// DEFAULT: @___asan_gen_{{.*}} = {{.*}} c"global_h\00"
// DEFAULT: @___asan_gen_{{.*}} = {{.*}} c"global_c\00"
// SANITIZE: @___asan_gen_{{.*}} = {{.*}} c"global_h\00"
// SANITIZE: @___asan_gen_{{.*}} = {{.*}} c"global_c\00"
// IGNORE-NOT: @___asan_gen_

// CHECK-LABEL: define {{.*}}@load(
// DEFAULT: call void @__ubsan_handle_type_mismatch_v1_abort(
// DEFAULT: call void @__asan_report_load4(
// SANITIZE: call void @__ubsan_handle_type_mismatch_v1_abort(
// SANITIZE: call void @__asan_report_load4(
// IGNORE-NOT: call void @__ubsan_handle_type_mismatch_v1_abort(
// IGNORE-NOT: call void @__asan_report_load4(
Loading