Merge from mainline.

llvm-svn: 51444

1 files changed, 5 insertions, 0 deletions

diff --git a/llvm/include/llvm/User.h b/llvm/include/llvm/User.h
index d3e4f1e..ec76490 100644
--- a/llvm/include/llvm/User.h
+++ b/llvm/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];