From: Simon Marchi <simon.marchi@efficios.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH v2 2/2] gdbsupport: assume that compiler supports std::{is_trivially_constructible,is_trivially_copyable}
Date: Wed, 21 Feb 2024 11:46:52 -0500 [thread overview]
Message-ID: <20240221164709.54212-2-simon.marchi@efficios.com> (raw)
In-Reply-To: <20240221164709.54212-1-simon.marchi@efficios.com>
This code was there to support g++ 4, which didn't support
std::is_trivially_constructible and std::is_trivially_copyable. Since
we now require g++ >= 9, I think it's fair to assume that GDB will
always be compiled with a compiler that supports those.
Change-Id: Ie7c1649139a2f48bf662cac92d7f3e38fb1f1ba1
---
gdb/trad-frame.c | 2 --
gdb/unittests/array-view-selftests.c | 4 ----
gdb/unittests/enum-flags-selftests.c | 4 ----
gdb/unittests/packed-selftests.c | 4 ----
gdbsupport/check-defines.el | 2 --
gdbsupport/packed.h | 2 --
gdbsupport/poison.h | 8 --------
gdbsupport/traits.h | 21 ---------------------
8 files changed, 47 deletions(-)
diff --git a/gdb/trad-frame.c b/gdb/trad-frame.c
index 8b63927b133c..c35e08ab2805 100644
--- a/gdb/trad-frame.c
+++ b/gdb/trad-frame.c
@@ -61,9 +61,7 @@ trad_frame_reset_saved_regs (struct gdbarch *gdbarch,
trad_frame_saved_reg *
trad_frame_alloc_saved_regs (struct gdbarch *gdbarch)
{
-#ifdef HAVE_IS_TRIVIALLY_CONSTRUCTIBLE
static_assert (std::is_trivially_constructible<trad_frame_saved_reg>::value);
-#endif
int numregs = gdbarch_num_cooked_regs (gdbarch);
trad_frame_saved_reg *this_saved_regs
diff --git a/gdb/unittests/array-view-selftests.c b/gdb/unittests/array-view-selftests.c
index 9d2448fefc10..299318ace434 100644
--- a/gdb/unittests/array-view-selftests.c
+++ b/gdb/unittests/array-view-selftests.c
@@ -30,15 +30,11 @@ namespace array_view_tests {
#define CHECK_TRAIT(TRAIT) \
static_assert (std::TRAIT<gdb::array_view<gdb_byte>>::value, "")
-#if HAVE_IS_TRIVIALLY_COPYABLE
-
CHECK_TRAIT (is_trivially_copyable);
CHECK_TRAIT (is_trivially_move_assignable);
CHECK_TRAIT (is_trivially_move_constructible);
CHECK_TRAIT (is_trivially_destructible);
-#endif
-
#undef CHECK_TRAIT
/* Wrapper around std::is_convertible to make the code using it a bit
diff --git a/gdb/unittests/enum-flags-selftests.c b/gdb/unittests/enum-flags-selftests.c
index 607b8ac66a64..54e168173de6 100644
--- a/gdb/unittests/enum-flags-selftests.c
+++ b/gdb/unittests/enum-flags-selftests.c
@@ -63,14 +63,10 @@ DEF_ENUM_FLAGS_TYPE (RE, EF);
DEF_ENUM_FLAGS_TYPE (RE2, EF2);
DEF_ENUM_FLAGS_TYPE (URE, UEF);
-#if HAVE_IS_TRIVIALLY_COPYABLE
-
/* So that std::vectors of types that have enum_flags fields can
reallocate efficiently memcpy. */
static_assert (std::is_trivially_copyable<EF>::value);
-#endif
-
/* A couple globals used as lvalues in the CHECK_VALID expressions
below. Their names (and types) match the uppercase type names
exposed by CHECK_VALID just to make the expressions easier to
diff --git a/gdb/unittests/packed-selftests.c b/gdb/unittests/packed-selftests.c
index 3f20861ad4a2..852a7d364ce9 100644
--- a/gdb/unittests/packed-selftests.c
+++ b/gdb/unittests/packed-selftests.c
@@ -46,16 +46,12 @@ static_assert (alignof (packed<test_enum, 4>) == 1);
#define CHECK_TRAIT(TRAIT) \
static_assert (std::TRAIT<packed<test_enum, 1>>::value, "")
-#if HAVE_IS_TRIVIALLY_COPYABLE
-
CHECK_TRAIT (is_trivially_copyable);
CHECK_TRAIT (is_trivially_copy_constructible);
CHECK_TRAIT (is_trivially_move_constructible);
CHECK_TRAIT (is_trivially_copy_assignable);
CHECK_TRAIT (is_trivially_move_assignable);
-#endif
-
#undef CHECK_TRAIT
/* Entry point. */
diff --git a/gdbsupport/check-defines.el b/gdbsupport/check-defines.el
index 7603effc29de..b7cf61ba8599 100644
--- a/gdbsupport/check-defines.el
+++ b/gdbsupport/check-defines.el
@@ -35,8 +35,6 @@
(put (intern "HAVE_USEFUL_SBRK") :check-ok t)
(put (intern "HAVE_SOCKETS") :check-ok t)
(put (intern "HAVE_F_GETFD") :check-ok t)
-(put (intern "HAVE_IS_TRIVIALLY_COPYABLE") :check-ok t)
-(put (intern "HAVE_IS_TRIVIALLY_CONSTRUCTIBLE") :check-ok t)
(put (intern "HAVE_DOS_BASED_FILE_SYSTEM") :check-ok t)
(defun check-read-config.in (file)
diff --git a/gdbsupport/packed.h b/gdbsupport/packed.h
index 8035535386b0..5c817d4c9cce 100644
--- a/gdbsupport/packed.h
+++ b/gdbsupport/packed.h
@@ -80,9 +80,7 @@ struct ATTRIBUTE_GCC_STRUCT packed
static_assert (alignof (packed) == 1);
/* Make sure packed can be wrapped with std::atomic. */
-#if HAVE_IS_TRIVIALLY_COPYABLE
static_assert (std::is_trivially_copyable<packed>::value);
-#endif
static_assert (std::is_copy_constructible<packed>::value);
static_assert (std::is_move_constructible<packed>::value);
static_assert (std::is_copy_assignable<packed>::value);
diff --git a/gdbsupport/poison.h b/gdbsupport/poison.h
index 0d0159eb7f81..7b4f8e8a178d 100644
--- a/gdbsupport/poison.h
+++ b/gdbsupport/poison.h
@@ -56,8 +56,6 @@ template <typename T,
typename = gdb::Requires<gdb::Not<IsMemsettable<T>>>>
void *memset (T *s, int c, size_t n) = delete;
-#if HAVE_IS_TRIVIALLY_COPYABLE
-
/* Similarly, poison memcpy and memmove of non trivially-copyable
types, which is undefined. */
@@ -83,17 +81,11 @@ template <typename D, typename S,
typename = gdb::Requires<gdb::Not<BothAreRelocatable<D, S>>>>
void *memmove (D *dest, const S *src, size_t n) = delete;
-#endif /* HAVE_IS_TRIVIALLY_COPYABLE */
-
/* Poison XNEW and friends to catch usages of malloc-style allocations on
objects that require new/delete. */
template<typename T>
-#if HAVE_IS_TRIVIALLY_CONSTRUCTIBLE
using IsMallocable = std::is_trivially_constructible<T>;
-#else
-using IsMallocable = std::true_type;
-#endif
template<typename T>
using IsFreeable = gdb::Or<std::is_trivially_destructible<T>, std::is_void<T>>;
diff --git a/gdbsupport/traits.h b/gdbsupport/traits.h
index eb97b9659904..92fe59f34af7 100644
--- a/gdbsupport/traits.h
+++ b/gdbsupport/traits.h
@@ -20,27 +20,6 @@
#include <type_traits>
-/* GCC does not understand __has_feature. */
-#if !defined(__has_feature)
-# define __has_feature(x) 0
-#endif
-
-/* HAVE_IS_TRIVIALLY_COPYABLE is defined as 1 iff
- std::is_trivially_copyable is available. GCC only implemented it
- in GCC 5. */
-#if (__has_feature(is_trivially_copyable) \
- || (defined __GNUC__ && __GNUC__ >= 5))
-# define HAVE_IS_TRIVIALLY_COPYABLE 1
-#endif
-
-/* HAVE_IS_TRIVIALLY_CONSTRUCTIBLE is defined as 1 iff
- std::is_trivially_constructible is available. GCC only implemented it
- in GCC 5. */
-#if (__has_feature(is_trivially_constructible) \
- || (defined __GNUC__ && __GNUC__ >= 5))
-# define HAVE_IS_TRIVIALLY_CONSTRUCTIBLE 1
-#endif
-
namespace gdb {
/* Implementation of the detection idiom:
--
2.43.2
next prev parent reply other threads:[~2024-02-21 16:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-21 16:46 [PATCH v2 1/2] gdb: remove some GCC version checks Simon Marchi
2024-02-21 16:46 ` Simon Marchi [this message]
2024-02-21 17:09 ` Kevin Buettner
2024-02-21 17:36 ` Simon Marchi
2024-02-21 17:46 ` Pedro Alves
2024-02-21 18:31 ` Simon Marchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240221164709.54212-2-simon.marchi@efficios.com \
--to=simon.marchi@efficios.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).