From 950c00954ad3f5a2f389e9f832dc06aeae0d0581 Mon Sep 17 00:00:00 2001
From: Naomi Musgrave <nmusgrave@google.com>
Date: Mon, 31 Aug 2015 21:06:08 +0000
Subject: [PATCH] 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.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@246484 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/llvm/IR/User.h          | 3 ++-
 include/llvm/Support/Compiler.h | 2 --
 lib/IR/Metadata.cpp             | 4 +---
 lib/IR/User.cpp                 | 4 +---
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/include/llvm/IR/User.h b/include/llvm/IR/User.h
index 160f32819b0..93614fab575 100644
--- a/include/llvm/IR/User.h
+++ b/include/llvm/IR/User.h
@@ -72,7 +72,8 @@ protected:
   void growHungoffUses(unsigned N, bool IsPhi = false);
 
 public:
-  ~User() override {}
+  ~User() override {
+  }
   /// \brief Free memory allocated for User and Use objects.
   void operator delete(void *Usr);
   /// \brief Placement delete - required by std, but never called.
diff --git a/include/llvm/Support/Compiler.h b/include/llvm/Support/Compiler.h
index bd197e2308c..9f98bc398fe 100644
--- a/include/llvm/Support/Compiler.h
+++ b/include/llvm/Support/Compiler.h
@@ -323,12 +323,10 @@
 #if __has_feature(memory_sanitizer)
 # define LLVM_MEMORY_SANITIZER_BUILD 1
 # include <sanitizer/msan_interface.h>
-# define LLVM_NO_SANITIZE_MEMORY_ATTRIBUTE __attribute__((no_sanitize_memory))
 #else
 # define LLVM_MEMORY_SANITIZER_BUILD 0
 # define __msan_allocated_memory(p, size)
 # define __msan_unpoison(p, size)
-# define LLVM_NO_SANITIZE_MEMORY_ATTRIBUTE
 #endif
 
 /// \macro LLVM_ADDRESS_SANITIZER_BUILD
diff --git a/lib/IR/Metadata.cpp b/lib/IR/Metadata.cpp
index 51548a82576..7d8c3523743 100644
--- a/lib/IR/Metadata.cpp
+++ b/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<MDNode *>(Mem);
   size_t OpSize = N->NumOperands * sizeof(MDOperand);
   OpSize = RoundUpToAlignment(OpSize, llvm::alignOf<uint64_t>());
diff --git a/lib/IR/User.cpp b/lib/IR/User.cpp
index b64580ce043..522722d701b 100644
--- a/lib/IR/User.cpp
+++ b/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<User *>(Usr);
-- 
2.34.1