diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a8d727b87b1..edda8c918e0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2019-05-08  Tom Tromey  <tom@tromey.com>
+
+	* common/gdb_unique_ptr.h (struct noop_deleter): New.
+
 2019-05-08  Tom Tromey  <tom@tromey.com>
 
 	* nto-tdep.c (nto_inferior_data_reg): Change type.
diff --git a/gdb/common/gdb_unique_ptr.h b/gdb/common/gdb_unique_ptr.h
index 327e1279296..a4be2bb7963 100644
--- a/gdb/common/gdb_unique_ptr.h
+++ b/gdb/common/gdb_unique_ptr.h
@@ -47,6 +47,13 @@ struct xfree_deleter<T[]>
 template<typename T> using unique_xmalloc_ptr
   = std::unique_ptr<T, xfree_deleter<T>>;
 
+/* A no-op deleter.  */
+template<typename T>
+struct noop_deleter
+{
+  void operator() (T *ptr) const { }
+};
+
 } /* namespace gdb */
 
 #endif /* COMMON_GDB_UNIQUE_PTR_H */