From d8c1a064e5f1801b3c74039532eff14d4daaa10c Mon Sep 17 00:00:00 2001 From: Naomi Musgrave Date: Mon, 31 Aug 2015 15:57:40 +0000 Subject: Repress sanitization on User dtor. Modify msan macros for applying attribute to repress sanitization. Move attribute for repressing sanitization to operator delete for User, MDNode. Summary: In response to bug 24578, reported against failing LLVM test. Reviewers: chandlerc, rsmith, eugenis Subscribers: llvm-commits Differential Revision: http://reviews.llvm.org/D12335 llvm-svn: 246449 --- llvm/lib/IR/Metadata.cpp | 4 +++- llvm/lib/IR/User.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'llvm/lib/IR') diff --git a/llvm/lib/IR/Metadata.cpp b/llvm/lib/IR/Metadata.cpp index 7d8c3523743..51548a82576 100644 --- a/llvm/lib/IR/Metadata.cpp +++ b/llvm/lib/IR/Metadata.cpp @@ -401,7 +401,9 @@ void *MDNode::operator new(size_t Size, unsigned NumOps) { return Ptr; } -void MDNode::operator delete(void *Mem) { +// Repress memory sanitization, due to use-after-destroy by operator +// delete. Bug report 24578 identifies this issue. +LLVM_NO_SANITIZE_MEMORY_ATTRIBUTE void MDNode::operator delete(void *Mem) { MDNode *N = static_cast(Mem); size_t OpSize = N->NumOperands * sizeof(MDOperand); OpSize = RoundUpToAlignment(OpSize, llvm::alignOf()); diff --git a/llvm/lib/IR/User.cpp b/llvm/lib/IR/User.cpp index 522722d701b..b64580ce043 100644 --- a/llvm/lib/IR/User.cpp +++ b/llvm/lib/IR/User.cpp @@ -118,7 +118,9 @@ void *User::operator new(size_t Size) { // User operator delete Implementation //===----------------------------------------------------------------------===// -void User::operator delete(void *Usr) { +// Repress memory sanitization, due to use-after-destroy by operator +// delete. Bug report 24578 identifies this issue. +LLVM_NO_SANITIZE_MEMORY_ATTRIBUTE void User::operator delete(void *Usr) { // Hung off uses use a single Use* before the User, while other subclasses // use a Use[] allocated prior to the user. User *Obj = static_cast(Usr); -- cgit v1.2.3