diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/CodeGen/CGClass.cpp | 1 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/sanitize-dtor-callback.cpp | 3 |
2 files changed, 4 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 |
