[ASan] Do not instrument other runtime functions with `__asan_handle_no_return`
Summary:
Currently, ASan inserts a call to `__asan_handle_no_return` before every
`noreturn` function call/invoke. This is unnecessary for calls to other
runtime funtions. This patch changes ASan to skip instrumentation for
functions calls marked with `!nosanitize` metadata.
Reviewers: TODO
Differential Revision: https://reviews.llvm.org/D57489
llvm-svn: 352948
diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp
index 4051cfb..730dac3 100644
--- a/clang/lib/CodeGen/CGCall.cpp
+++ b/clang/lib/CodeGen/CGCall.cpp
@@ -4394,8 +4394,8 @@
// Strip away the noreturn attribute to better diagnose unreachable UB.
if (SanOpts.has(SanitizerKind::Unreachable)) {
- // Also remove from function since CI->hasFnAttr(..) also checks attributes
- // of the called function.
+ // Also remove from function since CallBase::hasFnAttr additionally checks
+ // attributes of the called function.
if (auto *F = CI->getCalledFunction())
F->removeFnAttr(llvm::Attribute::NoReturn);
CI->removeAttribute(llvm::AttributeList::FunctionIndex,
diff --git a/clang/test/CodeGen/ubsan-asan-noreturn.c b/clang/test/CodeGen/ubsan-asan-noreturn.c
index cd7b842..6dc0546 100644
--- a/clang/test/CodeGen/ubsan-asan-noreturn.c
+++ b/clang/test/CodeGen/ubsan-asan-noreturn.c
@@ -9,8 +9,7 @@
my_longjmp();
// CHECK: @__asan_handle_no_return{{.*}} !nosanitize
// CHECK-NEXT: @my_longjmp(){{[^#]*}}
- // CHECK: @__asan_handle_no_return()
- // CHECK-NEXT: @__ubsan_handle_builtin_unreachable{{.*}} !nosanitize
+ // CHECK: @__ubsan_handle_builtin_unreachable{{.*}} !nosanitize
// CHECK-NEXT: unreachable
}