diff options
| -rw-r--r-- | llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp | 16 | ||||
| -rw-r--r-- | llvm/test/Instrumentation/AddressSanitizer/do-not-instrument-sanitizers.ll | 24 |
2 files changed, 34 insertions, 6 deletions
diff --git a/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp b/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp index a5972d45993..df180df7dea 100644 --- a/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp +++ b/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp @@ -1882,17 +1882,21 @@ void AddressSanitizer::markEscapedLocalAllocas(Function &F) { bool AddressSanitizer::runOnFunction(Function &F) { if (&F == AsanCtorFunction) return false; if (F.getLinkage() == GlobalValue::AvailableExternallyLinkage) return false; - DEBUG(dbgs() << "ASAN instrumenting:\n" << F << "\n"); - initializeCallbacks(*F.getParent()); - - DT = &getAnalysis<DominatorTreeWrapperPass>().getDomTree(); + if (!ClDebugFunc.empty() && ClDebugFunc == F.getName()) return false; + if (F.getName().find("__asan_") != std::string::npos) return false; // If needed, insert __asan_init before checking for SanitizeAddress attr. + // This function needs to be called even if the function body is not + // instrumented. maybeInsertAsanInitAtFunctionEntry(F); - + + // Leave if the function doesn't need instrumentation. if (!F.hasFnAttribute(Attribute::SanitizeAddress)) return false; - if (!ClDebugFunc.empty() && ClDebugFunc != F.getName()) return false; + DEBUG(dbgs() << "ASAN instrumenting:\n" << F << "\n"); + + initializeCallbacks(*F.getParent()); + DT = &getAnalysis<DominatorTreeWrapperPass>().getDomTree(); FunctionStateRAII CleanupObj(this); diff --git a/llvm/test/Instrumentation/AddressSanitizer/do-not-instrument-sanitizers.ll b/llvm/test/Instrumentation/AddressSanitizer/do-not-instrument-sanitizers.ll new file mode 100644 index 00000000000..fc263aad784 --- /dev/null +++ b/llvm/test/Instrumentation/AddressSanitizer/do-not-instrument-sanitizers.ll @@ -0,0 +1,24 @@ +; This test checks that we are not instrumenting sanitizer code. +; RUN: opt < %s -asan -asan-module -S | FileCheck %s + +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-unknown-linux-gnu" + +; Function Attrs: nounwind uwtable +define void @__asan_default_options(i32* %a) sanitize_address { +entry: + %tmp1 = load i32, i32* %a, align 4 + %tmp2 = add i32 %tmp1, 1 + store i32 %tmp2, i32* %a, align 4 + ret void +} + +; CHECK-NOT: call void @__asan_report_load + +; Function Attrs: nounwind uwtable +define i32 @main() #0 { +entry: + ret i32 0 +} + +; CHECK: declare void @__asan_init()
\ No newline at end of file |
