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.

llvm-svn: 260190
This commit is contained in:
Richard Smith 2016-02-09 02:09:16 +00:00
parent 840144887a
commit a64e1adf84
3 changed files with 4 additions and 8 deletions

View File

@ -293,10 +293,6 @@ public:
// 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.

View File

@ -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 @@ public:
}
}
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; }

View File

@ -34,7 +34,7 @@ public:
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 @@ public:
*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)