From 21c1bc46aee2b69c2c48db8e961f0ce8394f21e1 Mon Sep 17 00:00:00 2001 From: Naomi Musgrave Date: Mon, 31 Aug 2015 21:06:08 +0000 Subject: Rollback of commit "Repress sanitization on User dtor." This would have suppressed bug 24578, about use-after- destroy on User and MDNode. Rolled back suppression for the sake of code cleanliness, in preferance for bug tracking to keep track of this issue. This reverts commit 6ff2baabc4625d5b0a8dccf76aa0f72d930ea6c0. llvm-svn: 246484 --- llvm/lib/IR/Metadata.cpp | 4 +--- llvm/lib/IR/User.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'llvm/lib/IR') diff --git a/llvm/lib/IR/Metadata.cpp b/llvm/lib/IR/Metadata.cpp index 51548a82576..7d8c3523743 100644 --- a/llvm/lib/IR/Metadata.cpp +++ b/llvm/lib/IR/Metadata.cpp @@ -401,9 +401,7 @@ void *MDNode::operator new(size_t Size, unsigned NumOps) { return Ptr; } -// 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) { +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 b64580ce043..522722d701b 100644 --- a/llvm/lib/IR/User.cpp +++ b/llvm/lib/IR/User.cpp @@ -118,9 +118,7 @@ void *User::operator new(size_t Size) { // User operator delete Implementation //===----------------------------------------------------------------------===// -// 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) { +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