diff options
| -rw-r--r-- | clang/lib/CodeGen/CGClass.cpp | 1 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/sanitize-dtor-callback.cpp | 3 | ||||
| -rw-r--r-- | llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp | 1 | ||||
| -rw-r--r-- | llvm/test/Instrumentation/MemorySanitizer/call-nosanitize.ll | 16 |
4 files changed, 21 insertions, 0 deletions
diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp index 6a41110982f..1ebe5219cd1 100644 --- a/clang/lib/CodeGen/CGClass.cpp +++ b/clang/lib/CodeGen/CGClass.cpp @@ -1577,6 +1577,7 @@ namespace { static void EmitSanitizerDtorCallback(CodeGenFunction &CGF, llvm::Value *Ptr, CharUnits::QuantityType PoisonSize) { + CodeGenFunction::SanitizerScope SanScope(&CGF); // Pass in void pointer and size of region as arguments to runtime // function llvm::Value *Args[] = {CGF.Builder.CreateBitCast(Ptr, CGF.VoidPtrTy), diff --git a/clang/test/CodeGenCXX/sanitize-dtor-callback.cpp b/clang/test/CodeGenCXX/sanitize-dtor-callback.cpp index e208a6f7e5a..ecb0f2b2d13 100644 --- a/clang/test/CodeGenCXX/sanitize-dtor-callback.cpp +++ b/clang/test/CodeGenCXX/sanitize-dtor-callback.cpp @@ -55,16 +55,19 @@ Defaulted_Non_Trivial def_non_trivial; // to confirm that all invoked dtors have member poisoning // instrumentation inserted. // CHECK-LABEL: define {{.*}}SimpleD2Ev +// CHECK-NOT: store i{{[0-9]+}} 0, {{.*}}@__msan_param_tls // CHECK: call void @__sanitizer_dtor_callback // CHECK-NOT: call void @__sanitizer_dtor_callback // CHECK: ret void // CHECK-LABEL: define {{.*}}InlinedD2Ev +// CHECK-NOT: store i{{[0-9]+}} 0, {{.*}}@__msan_param_tls // CHECK: call void @__sanitizer_dtor_callback // CHECK-NOT: call void @__sanitizer_dtor_callback // CHECK: ret void // CHECK-LABEL: define {{.*}}Defaulted_Non_TrivialD2Ev +// CHECK-NOT: store i{{[0-9]+}} 0, {{.*}}@__msan_param_tls // CHECK: call void @__sanitizer_dtor_callback // CHECK-NOT: call void @__sanitizer_dtor_callback // CHECK: ret void diff --git a/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp b/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp index b7c6271869c..3b33ced2640 100644 --- a/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp +++ b/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp @@ -2588,6 +2588,7 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> { void visitCallSite(CallSite CS) { Instruction &I = *CS.getInstruction(); + if (I.getMetadata("nosanitize")) return; assert((CS.isCall() || CS.isInvoke()) && "Unknown type of CallSite"); if (CS.isCall()) { CallInst *Call = cast<CallInst>(&I); diff --git a/llvm/test/Instrumentation/MemorySanitizer/call-nosanitize.ll b/llvm/test/Instrumentation/MemorySanitizer/call-nosanitize.ll new file mode 100644 index 00000000000..b5e6937f9f8 --- /dev/null +++ b/llvm/test/Instrumentation/MemorySanitizer/call-nosanitize.ll @@ -0,0 +1,16 @@ +; Verify that calls with !nosanitize are not instrumented by MSan. +; RUN: opt < %s -msan -S | FileCheck %s +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-unknown-linux-gnu" + +declare void @bar(i32 %x) + +define void @foo() { + call void @bar(i32 7), !nosanitize !{} + ret void +} + +; CHECK-LABEL: define void @foo +; CHECK-NOT: store i{{[0-9]+}} 0, {{.*}} @__msan_param_tls +; CHECK: call void @bar +; CHECK: ret void |
