Remove TrailingObjects::operator delete. It's still suffering from

compiler-specific issues. Instead, repeat an 'operator delete' definition in
each derived class that is actually deleted, and give up on the static type
safety of an error when sized delete is accidentally used on a type derived
from TrailingObjects.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@260190 91177308-0d34-0410-b5e6-96231b3b80d8

include/llvm/Support/TrailingObjects.h

@@ -293,10 +293,6 @@ class TrailingObjects : private trailing_objects_internal::TrailingObjectsImpl<
   // Make this (privately inherited) member public.
   using ParentType::OverloadToken;
 
-  /// Disable sized deallocation for all objects with trailing object storage;
-  /// the inferred size will typically not be correct.
-  void operator delete(void *P) { return ::operator delete(P); }
-
   /// Returns a pointer to the trailing object array of the given type
   /// (which must be one of those specified in the class template). The
   /// array may have zero or more elements in it.

lib/IR/AttributeImpl.h

@@ -171,7 +171,7 @@ class AttributeSetNode final
   void operator=(const AttributeSetNode &) = delete;
   AttributeSetNode(const AttributeSetNode &) = delete;
 public:
-  void operator delete(void *p) { TrailingObjects::operator delete(p); }
+  void operator delete(void *p) { ::operator delete(p); }
 
   static AttributeSetNode *get(LLVMContext &C, ArrayRef<Attribute> Attrs);
 
@@ -268,7 +268,7 @@ class AttributeSetImpl final
     }
   }
 
-  void operator delete(void *p) { TrailingObjects::operator delete(p); }
+  void operator delete(void *p) { ::operator delete(p); }
 
   /// \brief Get the context that created this AttributeSetImpl.
   LLVMContext &getContext() { return Context; }

unittests/Support/TrailingObjectsTest.cpp

@@ -34,7 +34,7 @@ class Class1 final : protected TrailingObjects<Class1, short> {
     void *Mem = ::operator new(totalSizeToAlloc<short>(NumShorts));
     return new (Mem) Class1(ShortArray, NumShorts);
   }
-  void operator delete(void *p) { TrailingObjects::operator delete(p); }
+  void operator delete(void *p) { ::operator delete(p); }
 
   short get(unsigned Num) const { return getTrailingObjects<short>()[Num]; }
 
@@ -79,7 +79,7 @@ class Class2 final : protected TrailingObjects<Class2, double, short> {
       *C->getTrailingObjects<double>() = D;
     return C;
   }
-  void operator delete(void *p) { TrailingObjects::operator delete(p); }
+  void operator delete(void *p) { ::operator delete(p); }
 
   short getShort() const {
     if (!HasShort)