From 8172f16b5b8bf3007d0aafcb38964a408f0e844f Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Fri, 24 Nov 2017 10:42:01 -0500 Subject: Poison XNEW and friends for types that should use new/delete MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch (finally!) makes it so that trying to use XNEW with a type that requires "new" will cause a compilation error. The criterion I initially used to allow a type to use XNEW (which calls malloc in the end) was std::is_trivially_constructible, but then realized that gcc 4.8 did not have it. Instead, I went with: using IsMallocatable = std::is_pod; which is just a bit more strict, which doesn't hurt. A similar thing is done for macros that free instead of allocated, the criterion is: using IsFreeable = gdb::Or, std::is_void>; Trying to use XNEW on a type that requires new will result in an error like this: In file included from /home/simark/src/binutils-gdb/gdb/common/common-utils.h:26:0, from /home/simark/src/binutils-gdb/gdb/common/common-defs.h:78, from /home/simark/src/binutils-gdb/gdb/defs.h:28, from /home/simark/src/binutils-gdb/gdb/lala.c:1: /home/simark/src/binutils-gdb/gdb/common/poison.h: In instantiation of ‘T* xnew() [with T = bar]’: /home/simark/src/binutils-gdb/gdb/lala.c:13:3: required from here /home/simark/src/binutils-gdb/gdb/common/poison.h:103:3: error: static assertion failed: Trying to use XNEW with a non-POD data type. Use operator new instead. static_assert (IsMallocatable::value, "Trying to use XNEW with a non-POD\ ^~~~~~~~~~~~~ Generated-code-wise, it adds one more function call (xnew) when using XNEW and building with -O0, but it all goes away with optimizations enabled. gdb/ChangeLog: * common/common-utils.h: Include poison.h. (xfree): Remove declaration, add definition with static_assert. * common/common-utils.c (xfree): Remove. * common/poison.h (IsMallocatable): Define. (IsFreeable): Define. (free): Delete for non-freeable types. (xnew): New. (XNEW): Undef and redefine. (xcnew): New. (XCNEW): Undef and redefine. (xdelete): New. (XDELETE): Undef and redefine. (xnewvec): New. (XNEWVEC): Undef and redefine. (xcnewvec): New. (XCNEWVEC): Undef and redefine. (xresizevec): New. (XRESIZEVEC): Undef and redefine. (xdeletevec): New. (XDELETEVEC): Undef and redefine. (xnewvar): New. (XNEWVAR): Undef and redefine. (xcnewvar): New. (XCNEWVAR): Undef and redefine. (xresizevar): New. (XRESIZEVAR): Undef and redefine. --- gdb/ChangeLog | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gdb/ChangeLog') diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3696c5c..1030729e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,34 @@ 2017-11-24 Simon Marchi + * common/common-utils.h: Include poison.h. + (xfree): Remove declaration, add definition with static_assert. + * common/common-utils.c (xfree): Remove. + * common/poison.h (IsMallocatable): Define. + (IsFreeable): Define. + (free): Delete for non-freeable types. + (xnew): New. + (XNEW): Undef and redefine. + (xcnew): New. + (XCNEW): Undef and redefine. + (xdelete): New. + (XDELETE): Undef and redefine. + (xnewvec): New. + (XNEWVEC): Undef and redefine. + (xcnewvec): New. + (XCNEWVEC): Undef and redefine. + (xresizevec): New. + (XRESIZEVEC): Undef and redefine. + (xdeletevec): New. + (XDELETEVEC): Undef and redefine. + (xnewvar): New. + (XNEWVAR): Undef and redefine. + (xcnewvar): New. + (XCNEWVAR): Undef and redefine. + (xresizevar): New. + (XRESIZEVAR): Undef and redefine. + +2017-11-24 Simon Marchi + * gdbthread.h (private_thread_info): Define structure type, add virtual pure destructor. (thread_info) : Change type to unique_ptr. -- cgit v1.1