Merge from mainline.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_23@51444 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 5 insertions, 0 deletions

diff --git a/include/llvm/User.h b/include/llvm/User.h
index d3e4f1ede2a9..ec764901bf18 100644
--- a/include/llvm/User.h
+++ b/include/llvm/User.h
@@ -46,6 +46,11 @@ protected:
     : Value(Ty, vty), OperandList(OpList), NumOperands(NumOps) {}
 
 public:
+  /// placement delete - required by std, but never called.
+  void operator delete(void*, size_t) {
+    assert(0 && "Constructor throws?");
+  }
+
   Value *getOperand(unsigned i) const {
     assert(i < NumOperands && "getOperand() out of range!");
     return OperandList[i];