* [pushed v2 0/4] Rewrite enum_flags, add unit tests, fix problems
@ 2020-09-14 21:31 Pedro Alves
2020-09-14 21:31 ` [pushed v2 1/4] Use type_instance_flags more throughout Pedro Alves
` (3 more replies)
0 siblings, 4 replies; 14+ messages in thread
From: Pedro Alves @ 2020-09-14 21:31 UTC (permalink / raw)
To: gdb-patches
I've addressed the review comments made to v1 of this series,
originally posted at:
https://sourceware.org/pipermail/gdb-patches/2020-August/171392.html
and merged it.
Changes in v2:
Patch #1 includes Andrew's bits, with a tweak -- I'm calling the new
method type::instance_flags() instead of type::get_instance_flags() to
follow the same scheme of the other getters/setters. That required
renaming the type::instance_flags data field. And since we now have
the methods, I got rid of SET_TYPE_INSTANCE_FLAGS and just used the
method directly throughout.
Patch #2 is new, to address a comment from Tromey.
Patch #3 is unmodified.
Patch #4 includes the fix that disables the rvalue ref compound
assignemnt operators.
Pedro Alves (4):
Use type_instance_flags more throughout
Rename address_space_int_to_name/address_space_name_to_int
Rewrite valid-expr.h's internals in terms of the detection idiom
(C++17/N4502)
Rewrite enum_flags, add unit tests, fix problems
gdb/ChangeLog | 88 ++++++
gdbsupport/ChangeLog | 30 ++
gdb/Makefile.in | 1 +
gdb/avr-tdep.c | 15 +-
gdb/btrace.c | 4 +-
gdb/c-typeprint.c | 5 +-
gdb/compile/compile-c-types.c | 3 +-
gdb/compile/compile-cplus-symbols.c | 4 +-
gdb/compile/compile-cplus-types.c | 10 +-
gdb/d-lang.c | 11 +-
gdb/dwarf2/read.c | 7 +-
gdb/eval.c | 2 +-
gdb/ft32-tdep.c | 16 +-
gdb/gdbarch.c | 8 +-
gdb/gdbarch.h | 16 +-
gdb/gdbarch.sh | 10 +-
gdb/gdbtypes.c | 82 ++---
gdb/gdbtypes.h | 26 +-
gdb/go-exp.y | 2 +-
gdb/record-btrace.c | 10 +-
gdb/s390-tdep.c | 13 +-
gdb/stabsread.c | 2 +-
gdb/type-stack.c | 9 +-
gdb/type-stack.h | 10 +-
gdb/unittests/enum-flags-selftests.c | 586 +++++++++++++++++++++++++++++++++++
gdbsupport/enum-flags.h | 370 +++++++++++++++++-----
gdbsupport/traits.h | 67 ++++
gdbsupport/valid-expr.h | 35 ++-
28 files changed, 1227 insertions(+), 215 deletions(-)
create mode 100644 gdb/unittests/enum-flags-selftests.c
base-commit: 27087b7f6ce8c6d304b149df2484436d97e6334b
--
2.14.5
^ permalink raw reply [flat|nested] 14+ messages in thread
* [pushed v2 1/4] Use type_instance_flags more throughout
2020-09-14 21:31 [pushed v2 0/4] Rewrite enum_flags, add unit tests, fix problems Pedro Alves
@ 2020-09-14 21:31 ` Pedro Alves
2020-09-15 2:28 ` [pushed] gdb: remove TYPE_INSTANCE_FLAGS Simon Marchi
2020-09-14 21:31 ` [pushed v2 2/4] Rename address_space_int_to_name/address_space_name_to_int Pedro Alves
` (2 subsequent siblings)
3 siblings, 1 reply; 14+ messages in thread
From: Pedro Alves @ 2020-09-14 21:31 UTC (permalink / raw)
To: gdb-patches
A later patch in this series will rewrite enum_flags fixing some API
holes. That would cause build failures around code using
type_instance_flags. Or rather, that should be using it, but wasn't.
This patch fixes it by using type_instance_flags throughout instead of
plain integers.
Note that we can't make the seemingly obvious change to struct
type::instance_flags:
- unsigned instance_flags : 9;
+ ENUM_BITFIELD (type_instance_flag_value) instance_flags : 9;
Because G++ complains then that 9 bits isn't sufficient for holding
all values of type_instance_flag_value.
So the patch adds an type::instance_flags() method, which takes care
of casting appropriately, and adds a separate type::set_instance_flags
method, following the pattern of the ongoing TYPE_XXX macro
elimination. This converts uses of TYPE_INSTANCE_FLAGS to
type::instance_flags() in the places where the code was already being
touched, but there are still many references to the
TYPE_INSTANCE_FLAGS macro left behind. Those could/should be fully
replaced at some point.
gdb/ChangeLog:
* avr-tdep.c (avr_address_class_type_flags): Return
type_instance_flags.
(avr_address_class_type_flags_to_name): Take a
type_instance_flags.
(avr_address_class_name_to_type_flags): Return bool and take a
type_instance_flags.
* d-lang.c (build_d_types): Use type::set_instance_flags.
* ft32-tdep.c (ft32_address_class_type_flags): Return
type_instance_flags.
(ft32_address_class_type_flags_to_name): Take a
type_instance_flags.
(ft32_address_class_name_to_type_flags): Return bool and take a
type_instance_flags.
(ft32_gdbarch_init): Use type::set_instance_flags.
* eval.c (fake_method::fake_method): Use type::set_instance_flags.
* gdbarch.h, gdbarch.c: Regenerate.
* gdbarch.sh (address_class_type_flags): Use type_instance_flags.
(address_class_name_to_type_flags): Use type_instance_flags and
bool.
* gdbtypes.c (address_space_name_to_int)
(address_space_int_to_name, make_qualified_type): Use
type_instance_flags.
(make_qualified_type): Use type_instance_flags and
type::set_instance_flags.
(make_type_with_address_space, make_cv_type, make_vector_type)
(check_typedef): Use type_instance_flags.
(recursive_dump_type): Cast type_instance_flags to unsigned for
printing.
(copy_type_recursive): Use type::set_instance_flags.
(gdbtypes_post_init): Use type::set_instance_flags.
* gdbtypes.h (struct type) <instance_flags>: Rename to ...
<m_instance_flags>: ... this.
<instance_flags, set_instance_flags>: New methods.
(TYPE_INSTANCE_FLAGS): Use the instance_flags method.
(SET_TYPE_INSTANCE_FLAGS): New.
(address_space_name_to_int, address_space_int_to_name)
(make_type_with_address_space): Pass flags using
type_instance_flags instead of int.
* stabsread.c (cleanup_undefined_types_noname): Use
type::set_instance_flags.
* s390-tdep.c (s390_address_class_type_flags): Return
type_instance_flags.
(s390_address_class_type_flags_to_name): Take a
type_instance_flags.
(s390_address_class_name_to_type_flags): Return bool and take a
type_instance_flags.
* type-stack.c (type_stack::follow_types): Use
type_instance_flags.
* dwarf2/read.c (read_tag_pointer_type): Use type_instance_flags.
---
gdb/ChangeLog | 53 +++++++++++++++++++++++++++++++++++++++++
gdb/avr-tdep.c | 15 ++++++------
gdb/d-lang.c | 11 +++++----
gdb/dwarf2/read.c | 7 +++---
gdb/eval.c | 2 +-
gdb/ft32-tdep.c | 16 +++++++------
gdb/gdbarch.c | 8 +++----
gdb/gdbarch.h | 16 ++++++-------
gdb/gdbarch.sh | 10 ++++----
gdb/gdbtypes.c | 70 +++++++++++++++++++++++++++++++------------------------
gdb/gdbtypes.h | 26 ++++++++++++++++-----
gdb/s390-tdep.c | 13 ++++++-----
gdb/stabsread.c | 2 +-
gdb/type-stack.c | 4 ++--
14 files changed, 168 insertions(+), 85 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 771a9d5201..7d4800b0b0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,56 @@
+2020-09-14 Pedro Alves <pedro@palves.net>
+ Andrew Burgess <andrew.burgess@embecosm.com>
+
+ * avr-tdep.c (avr_address_class_type_flags): Return
+ type_instance_flags.
+ (avr_address_class_type_flags_to_name): Take a
+ type_instance_flags.
+ (avr_address_class_name_to_type_flags): Return bool and take a
+ type_instance_flags.
+ * d-lang.c (build_d_types): Use type::set_instance_flags.
+ * ft32-tdep.c (ft32_address_class_type_flags): Return
+ type_instance_flags.
+ (ft32_address_class_type_flags_to_name): Take a
+ type_instance_flags.
+ (ft32_address_class_name_to_type_flags): Return bool and take a
+ type_instance_flags.
+ (ft32_gdbarch_init): Use type::set_instance_flags.
+ * eval.c (fake_method::fake_method): Use type::set_instance_flags.
+ * gdbarch.h, gdbarch.c: Regenerate.
+ * gdbarch.sh (address_class_type_flags): Use type_instance_flags.
+ (address_class_name_to_type_flags): Use type_instance_flags and
+ bool.
+ * gdbtypes.c (address_space_name_to_int)
+ (address_space_int_to_name, make_qualified_type): Use
+ type_instance_flags.
+ (make_qualified_type): Use type_instance_flags and
+ type::set_instance_flags.
+ (make_type_with_address_space, make_cv_type, make_vector_type)
+ (check_typedef): Use type_instance_flags.
+ (recursive_dump_type): Cast type_instance_flags to unsigned for
+ printing.
+ (copy_type_recursive): Use type::set_instance_flags.
+ (gdbtypes_post_init): Use type::set_instance_flags.
+ * gdbtypes.h (struct type) <instance_flags>: Rename to ...
+ <m_instance_flags>: ... this.
+ <instance_flags, set_instance_flags>: New methods.
+ (TYPE_INSTANCE_FLAGS): Use the instance_flags method.
+ (SET_TYPE_INSTANCE_FLAGS): New.
+ (address_space_name_to_int, address_space_int_to_name)
+ (make_type_with_address_space): Pass flags using
+ type_instance_flags instead of int.
+ * stabsread.c (cleanup_undefined_types_noname): Use
+ type::set_instance_flags.
+ * s390-tdep.c (s390_address_class_type_flags): Return
+ type_instance_flags.
+ (s390_address_class_type_flags_to_name): Take a
+ type_instance_flags.
+ (s390_address_class_name_to_type_flags): Return bool and take a
+ type_instance_flags.
+ * type-stack.c (type_stack::follow_types): Use
+ type_instance_flags.
+ * dwarf2/read.c (read_tag_pointer_type): Use type_instance_flags.
+
2020-09-14 Tom Tromey <tromey@adacore.com>
* x86-tdep.h (x86_in_indirect_branch_thunk): Update.
diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index 74ab531711..68b8487de7 100644
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -1372,7 +1372,7 @@ avr_dwarf_reg_to_regnum (struct gdbarch *gdbarch, int reg)
This method maps DW_AT_address_class attributes to a
type_instance_flag_value. */
-static int
+static type_instance_flags
avr_address_class_type_flags (int byte_size, int dwarf2_addr_class)
{
/* The value 1 of the DW_AT_address_class attribute corresponds to the
@@ -1389,7 +1389,8 @@ avr_address_class_type_flags (int byte_size, int dwarf2_addr_class)
Convert a type_instance_flag_value to an address space qualifier. */
static const char*
-avr_address_class_type_flags_to_name (struct gdbarch *gdbarch, int type_flags)
+avr_address_class_type_flags_to_name (struct gdbarch *gdbarch,
+ type_instance_flags type_flags)
{
if (type_flags & AVR_TYPE_INSTANCE_FLAG_ADDRESS_CLASS_FLASH)
return "flash";
@@ -1401,18 +1402,18 @@ avr_address_class_type_flags_to_name (struct gdbarch *gdbarch, int type_flags)
Convert an address space qualifier to a type_instance_flag_value. */
-static int
+static bool
avr_address_class_name_to_type_flags (struct gdbarch *gdbarch,
- const char* name,
- int *type_flags_ptr)
+ const char* name,
+ type_instance_flags *type_flags_ptr)
{
if (strcmp (name, "flash") == 0)
{
*type_flags_ptr = AVR_TYPE_INSTANCE_FLAG_ADDRESS_CLASS_FLASH;
- return 1;
+ return true;
}
else
- return 0;
+ return false;
}
/* Initialize the gdbarch structure for the AVR's. */
diff --git a/gdb/d-lang.c b/gdb/d-lang.c
index 837a064600..abef3b6fa4 100644
--- a/gdb/d-lang.c
+++ b/gdb/d-lang.c
@@ -321,10 +321,13 @@ build_d_types (struct gdbarch *gdbarch)
= arch_float_type (gdbarch, gdbarch_long_double_bit (gdbarch),
"real", gdbarch_long_double_format (gdbarch));
- TYPE_INSTANCE_FLAGS (builtin_d_type->builtin_byte)
- |= TYPE_INSTANCE_FLAG_NOTTEXT;
- TYPE_INSTANCE_FLAGS (builtin_d_type->builtin_ubyte)
- |= TYPE_INSTANCE_FLAG_NOTTEXT;
+ builtin_d_type->builtin_byte->set_instance_flags
+ (builtin_d_type->builtin_byte->instance_flags ()
+ | TYPE_INSTANCE_FLAG_NOTTEXT);
+
+ builtin_d_type->builtin_ubyte->set_instance_flags
+ (builtin_d_type->builtin_ubyte->instance_flags ()
+ | TYPE_INSTANCE_FLAG_NOTTEXT);
/* Imaginary and complex types. */
builtin_d_type->builtin_ifloat
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 0644a2d5f9..2c554d6d5c 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -17296,10 +17296,9 @@ read_tag_pointer_type (struct die_info *die, struct dwarf2_cu *cu)
{
if (gdbarch_address_class_type_flags_p (gdbarch))
{
- int type_flags;
-
- type_flags = gdbarch_address_class_type_flags
- (gdbarch, byte_size, addr_class);
+ type_instance_flags type_flags
+ = gdbarch_address_class_type_flags (gdbarch, byte_size,
+ addr_class);
gdb_assert ((type_flags & ~TYPE_INSTANCE_FLAG_ADDRESS_CLASS_ALL)
== 0);
type = make_type_with_address_space (type, type_flags);
diff --git a/gdb/eval.c b/gdb/eval.c
index e5e88f3c9b..1177f7444e 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -659,7 +659,7 @@ fake_method::fake_method (type_instance_flags flags,
TYPE_LENGTH (type) = 1;
type->set_code (TYPE_CODE_METHOD);
TYPE_CHAIN (type) = type;
- TYPE_INSTANCE_FLAGS (type) = flags;
+ type->set_instance_flags (flags);
if (num_types > 0)
{
if (param_types[num_types - 1] == NULL)
diff --git a/gdb/ft32-tdep.c b/gdb/ft32-tdep.c
index 99ef69de77..57c1bbba0c 100644
--- a/gdb/ft32-tdep.c
+++ b/gdb/ft32-tdep.c
@@ -341,7 +341,7 @@ ft32_pointer_to_address (struct gdbarch *gdbarch,
This method maps DW_AT_address_class attributes to a
type_instance_flag_value. */
-static int
+static type_instance_flags
ft32_address_class_type_flags (int byte_size, int dwarf2_addr_class)
{
/* The value 1 of the DW_AT_address_class attribute corresponds to the
@@ -357,7 +357,8 @@ ft32_address_class_type_flags (int byte_size, int dwarf2_addr_class)
Convert a type_instance_flag_value to an address space qualifier. */
static const char*
-ft32_address_class_type_flags_to_name (struct gdbarch *gdbarch, int type_flags)
+ft32_address_class_type_flags_to_name (struct gdbarch *gdbarch,
+ type_instance_flags type_flags)
{
if (type_flags & TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1)
return "flash";
@@ -369,18 +370,18 @@ ft32_address_class_type_flags_to_name (struct gdbarch *gdbarch, int type_flags)
Convert an address space qualifier to a type_instance_flag_value. */
-static int
+static bool
ft32_address_class_name_to_type_flags (struct gdbarch *gdbarch,
const char* name,
- int *type_flags_ptr)
+ type_instance_flags *type_flags_ptr)
{
if (strcmp (name, "flash") == 0)
{
*type_flags_ptr = TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1;
- return 1;
+ return true;
}
else
- return 0;
+ return false;
}
/* Given a return value in `regbuf' with a type `valtype',
@@ -576,7 +577,8 @@ ft32_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
func_void_type = make_function_type (void_type, NULL);
tdep->pc_type = arch_pointer_type (gdbarch, 4 * TARGET_CHAR_BIT, NULL,
func_void_type);
- TYPE_INSTANCE_FLAGS (tdep->pc_type) |= TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1;
+ tdep->pc_type->set_instance_flags (tdep->pc_type->instance_flags ()
+ | TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1);
set_gdbarch_num_regs (gdbarch, FT32_NUM_REGS);
set_gdbarch_sp_regnum (gdbarch, FT32_SP_REGNUM);
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 062c86bd54..5e44047c2a 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -3546,7 +3546,7 @@ gdbarch_address_class_type_flags_p (struct gdbarch *gdbarch)
return gdbarch->address_class_type_flags != NULL;
}
-int
+type_instance_flags
gdbarch_address_class_type_flags (struct gdbarch *gdbarch, int byte_size, int dwarf2_addr_class)
{
gdb_assert (gdbarch != NULL);
@@ -3571,7 +3571,7 @@ gdbarch_address_class_type_flags_to_name_p (struct gdbarch *gdbarch)
}
const char *
-gdbarch_address_class_type_flags_to_name (struct gdbarch *gdbarch, int type_flags)
+gdbarch_address_class_type_flags_to_name (struct gdbarch *gdbarch, type_instance_flags type_flags)
{
gdb_assert (gdbarch != NULL);
gdb_assert (gdbarch->address_class_type_flags_to_name != NULL);
@@ -3611,8 +3611,8 @@ gdbarch_address_class_name_to_type_flags_p (struct gdbarch *gdbarch)
return gdbarch->address_class_name_to_type_flags != NULL;
}
-int
-gdbarch_address_class_name_to_type_flags (struct gdbarch *gdbarch, const char *name, int *type_flags_ptr)
+bool
+gdbarch_address_class_name_to_type_flags (struct gdbarch *gdbarch, const char *name, type_instance_flags *type_flags_ptr)
{
gdb_assert (gdbarch != NULL);
gdb_assert (gdbarch->address_class_name_to_type_flags != NULL);
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 87e55fa72b..9f98ae8356 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -854,14 +854,14 @@ extern void set_gdbarch_have_nonsteppable_watchpoint (struct gdbarch *gdbarch, i
extern int gdbarch_address_class_type_flags_p (struct gdbarch *gdbarch);
-typedef int (gdbarch_address_class_type_flags_ftype) (int byte_size, int dwarf2_addr_class);
-extern int gdbarch_address_class_type_flags (struct gdbarch *gdbarch, int byte_size, int dwarf2_addr_class);
+typedef type_instance_flags (gdbarch_address_class_type_flags_ftype) (int byte_size, int dwarf2_addr_class);
+extern type_instance_flags gdbarch_address_class_type_flags (struct gdbarch *gdbarch, int byte_size, int dwarf2_addr_class);
extern void set_gdbarch_address_class_type_flags (struct gdbarch *gdbarch, gdbarch_address_class_type_flags_ftype *address_class_type_flags);
extern int gdbarch_address_class_type_flags_to_name_p (struct gdbarch *gdbarch);
-typedef const char * (gdbarch_address_class_type_flags_to_name_ftype) (struct gdbarch *gdbarch, int type_flags);
-extern const char * gdbarch_address_class_type_flags_to_name (struct gdbarch *gdbarch, int type_flags);
+typedef const char * (gdbarch_address_class_type_flags_to_name_ftype) (struct gdbarch *gdbarch, type_instance_flags type_flags);
+extern const char * gdbarch_address_class_type_flags_to_name (struct gdbarch *gdbarch, type_instance_flags type_flags);
extern void set_gdbarch_address_class_type_flags_to_name (struct gdbarch *gdbarch, gdbarch_address_class_type_flags_to_name_ftype *address_class_type_flags_to_name);
/* Execute vendor-specific DWARF Call Frame Instruction. OP is the instruction.
@@ -872,13 +872,13 @@ extern bool gdbarch_execute_dwarf_cfa_vendor_op (struct gdbarch *gdbarch, gdb_by
extern void set_gdbarch_execute_dwarf_cfa_vendor_op (struct gdbarch *gdbarch, gdbarch_execute_dwarf_cfa_vendor_op_ftype *execute_dwarf_cfa_vendor_op);
/* Return the appropriate type_flags for the supplied address class.
- This function should return 1 if the address class was recognized and
- type_flags was set, zero otherwise. */
+ This function should return true if the address class was recognized and
+ type_flags was set, false otherwise. */
extern int gdbarch_address_class_name_to_type_flags_p (struct gdbarch *gdbarch);
-typedef int (gdbarch_address_class_name_to_type_flags_ftype) (struct gdbarch *gdbarch, const char *name, int *type_flags_ptr);
-extern int gdbarch_address_class_name_to_type_flags (struct gdbarch *gdbarch, const char *name, int *type_flags_ptr);
+typedef bool (gdbarch_address_class_name_to_type_flags_ftype) (struct gdbarch *gdbarch, const char *name, type_instance_flags *type_flags_ptr);
+extern bool gdbarch_address_class_name_to_type_flags (struct gdbarch *gdbarch, const char *name, type_instance_flags *type_flags_ptr);
extern void set_gdbarch_address_class_name_to_type_flags (struct gdbarch *gdbarch, gdbarch_address_class_name_to_type_flags_ftype *address_class_name_to_type_flags);
/* Is a register in a group */
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 8d221601b7..f9aed71fa7 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -691,16 +691,16 @@ v;int;cannot_step_breakpoint;;;0;0;;0
# See comment in target.h about continuable, steppable and
# non-steppable watchpoints.
v;int;have_nonsteppable_watchpoint;;;0;0;;0
-F;int;address_class_type_flags;int byte_size, int dwarf2_addr_class;byte_size, dwarf2_addr_class
-M;const char *;address_class_type_flags_to_name;int type_flags;type_flags
+F;type_instance_flags;address_class_type_flags;int byte_size, int dwarf2_addr_class;byte_size, dwarf2_addr_class
+M;const char *;address_class_type_flags_to_name;type_instance_flags type_flags;type_flags
# Execute vendor-specific DWARF Call Frame Instruction. OP is the instruction.
# FS are passed from the generic execute_cfa_program function.
m;bool;execute_dwarf_cfa_vendor_op;gdb_byte op, struct dwarf2_frame_state *fs;op, fs;;default_execute_dwarf_cfa_vendor_op;;0
# Return the appropriate type_flags for the supplied address class.
-# This function should return 1 if the address class was recognized and
-# type_flags was set, zero otherwise.
-M;int;address_class_name_to_type_flags;const char *name, int *type_flags_ptr;name, type_flags_ptr
+# This function should return true if the address class was recognized and
+# type_flags was set, false otherwise.
+M;bool;address_class_name_to_type_flags;const char *name, type_instance_flags *type_flags_ptr;name, type_flags_ptr
# Is a register in a group
m;int;register_reggroup_p;int regnum, struct reggroup *reggroup;regnum, reggroup;;default_register_reggroup_p;;0
# Fetch the pointer to the ith function argument.
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 45d62b7de5..b57353dec3 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -578,11 +578,11 @@ lookup_function_type_with_arguments (struct type *type,
/* Identify address space identifier by name --
return the integer flag defined in gdbtypes.h. */
-int
+type_instance_flags
address_space_name_to_int (struct gdbarch *gdbarch,
const char *space_identifier)
{
- int type_flags;
+ type_instance_flags type_flags;
/* Check for known address space delimiters. */
if (!strcmp (space_identifier, "code"))
@@ -602,7 +602,8 @@ address_space_name_to_int (struct gdbarch *gdbarch,
gdbtypes.h -- return the string version of the adress space name. */
const char *
-address_space_int_to_name (struct gdbarch *gdbarch, int space_flag)
+address_space_int_to_name (struct gdbarch *gdbarch,
+ type_instance_flags space_flag)
{
if (space_flag & TYPE_INSTANCE_FLAG_CODE_SPACE)
return "code";
@@ -621,7 +622,7 @@ address_space_int_to_name (struct gdbarch *gdbarch, int space_flag)
STORAGE must be in the same obstack as TYPE. */
static struct type *
-make_qualified_type (struct type *type, int new_flags,
+make_qualified_type (struct type *type, type_instance_flags new_flags,
struct type *storage)
{
struct type *ntype;
@@ -661,7 +662,7 @@ make_qualified_type (struct type *type, int new_flags,
TYPE_CHAIN (type) = ntype;
/* Now set the instance flags and return the new type. */
- TYPE_INSTANCE_FLAGS (ntype) = new_flags;
+ ntype->set_instance_flags (new_flags);
/* Set length of new type to that of the original type. */
TYPE_LENGTH (ntype) = TYPE_LENGTH (type);
@@ -679,13 +680,14 @@ make_qualified_type (struct type *type, int new_flags,
representations. */
struct type *
-make_type_with_address_space (struct type *type, int space_flag)
+make_type_with_address_space (struct type *type,
+ type_instance_flags space_flag)
{
- int new_flags = ((TYPE_INSTANCE_FLAGS (type)
- & ~(TYPE_INSTANCE_FLAG_CODE_SPACE
- | TYPE_INSTANCE_FLAG_DATA_SPACE
- | TYPE_INSTANCE_FLAG_ADDRESS_CLASS_ALL))
- | space_flag);
+ type_instance_flags new_flags = ((type->instance_flags ()
+ & ~(TYPE_INSTANCE_FLAG_CODE_SPACE
+ | TYPE_INSTANCE_FLAG_DATA_SPACE
+ | TYPE_INSTANCE_FLAG_ADDRESS_CLASS_ALL))
+ | space_flag);
return make_qualified_type (type, new_flags, NULL);
}
@@ -709,9 +711,9 @@ make_cv_type (int cnst, int voltl,
{
struct type *ntype; /* New type */
- int new_flags = (TYPE_INSTANCE_FLAGS (type)
- & ~(TYPE_INSTANCE_FLAG_CONST
- | TYPE_INSTANCE_FLAG_VOLATILE));
+ type_instance_flags new_flags = (type->instance_flags ()
+ & ~(TYPE_INSTANCE_FLAG_CONST
+ | TYPE_INSTANCE_FLAG_VOLATILE));
if (cnst)
new_flags |= TYPE_INSTANCE_FLAG_CONST;
@@ -1412,7 +1414,6 @@ void
make_vector_type (struct type *array_type)
{
struct type *inner_array, *elt_type;
- int flags;
/* Find the innermost array type, in case the array is
multi-dimensional. */
@@ -1423,7 +1424,8 @@ make_vector_type (struct type *array_type)
elt_type = TYPE_TARGET_TYPE (inner_array);
if (elt_type->code () == TYPE_CODE_INT)
{
- flags = TYPE_INSTANCE_FLAGS (elt_type) | TYPE_INSTANCE_FLAG_NOTTEXT;
+ type_instance_flags flags
+ = elt_type->instance_flags () | TYPE_INSTANCE_FLAG_NOTTEXT;
elt_type = make_qualified_type (elt_type, flags, NULL);
TYPE_TARGET_TYPE (inner_array) = elt_type;
}
@@ -2734,12 +2736,13 @@ struct type *
check_typedef (struct type *type)
{
struct type *orig_type = type;
- /* While we're removing typedefs, we don't want to lose qualifiers.
- E.g., const/volatile. */
- int instance_flags = TYPE_INSTANCE_FLAGS (type);
gdb_assert (type);
+ /* While we're removing typedefs, we don't want to lose qualifiers.
+ E.g., const/volatile. */
+ type_instance_flags instance_flags = type->instance_flags ();
+
while (type->code () == TYPE_CODE_TYPEDEF)
{
if (!TYPE_TARGET_TYPE (type))
@@ -2780,10 +2783,13 @@ check_typedef (struct type *type)
outer cast in a chain of casting win), instead of assuming
"it can't happen". */
{
- const int ALL_SPACES = (TYPE_INSTANCE_FLAG_CODE_SPACE
- | TYPE_INSTANCE_FLAG_DATA_SPACE);
- const int ALL_CLASSES = TYPE_INSTANCE_FLAG_ADDRESS_CLASS_ALL;
- int new_instance_flags = TYPE_INSTANCE_FLAGS (type);
+ const type_instance_flags ALL_SPACES
+ = (TYPE_INSTANCE_FLAG_CODE_SPACE
+ | TYPE_INSTANCE_FLAG_DATA_SPACE);
+ const type_instance_flags ALL_CLASSES
+ = TYPE_INSTANCE_FLAG_ADDRESS_CLASS_ALL;
+
+ type_instance_flags new_instance_flags = type->instance_flags ();
/* Treat code vs data spaces and address classes separately. */
if ((instance_flags & ALL_SPACES) != 0)
@@ -5028,7 +5034,7 @@ recursive_dump_type (struct type *type, int spaces)
gdb_print_host_address (TYPE_CHAIN (type), gdb_stdout);
printf_filtered ("\n");
printfi_filtered (spaces, "instance_flags 0x%x",
- TYPE_INSTANCE_FLAGS (type));
+ (unsigned) type->instance_flags ());
if (TYPE_CONST (type))
{
puts_filtered (" TYPE_CONST");
@@ -5302,7 +5308,7 @@ copy_type_recursive (struct objfile *objfile,
if (type->name ())
new_type->set_name (xstrdup (type->name ()));
- TYPE_INSTANCE_FLAGS (new_type) = TYPE_INSTANCE_FLAGS (type);
+ new_type->set_instance_flags (type->instance_flags ());
TYPE_LENGTH (new_type) = TYPE_LENGTH (type);
/* Copy the fields. */
@@ -5429,7 +5435,7 @@ copy_type (const struct type *type)
gdb_assert (TYPE_OBJFILE_OWNED (type));
new_type = alloc_type_copy (type);
- TYPE_INSTANCE_FLAGS (new_type) = TYPE_INSTANCE_FLAGS (type);
+ new_type->set_instance_flags (type->instance_flags ());
TYPE_LENGTH (new_type) = TYPE_LENGTH (type);
memcpy (TYPE_MAIN_TYPE (new_type), TYPE_MAIN_TYPE (type),
sizeof (struct main_type));
@@ -5822,10 +5828,14 @@ gdbtypes_post_init (struct gdbarch *gdbarch)
= arch_integer_type (gdbarch, 128, 0, "int128_t");
builtin_type->builtin_uint128
= arch_integer_type (gdbarch, 128, 1, "uint128_t");
- TYPE_INSTANCE_FLAGS (builtin_type->builtin_int8) |=
- TYPE_INSTANCE_FLAG_NOTTEXT;
- TYPE_INSTANCE_FLAGS (builtin_type->builtin_uint8) |=
- TYPE_INSTANCE_FLAG_NOTTEXT;
+
+ builtin_type->builtin_int8->set_instance_flags
+ (builtin_type->builtin_int8->instance_flags ()
+ | TYPE_INSTANCE_FLAG_NOTTEXT);
+
+ builtin_type->builtin_uint8->set_instance_flags
+ (builtin_type->builtin_uint8->instance_flags ()
+ | TYPE_INSTANCE_FLAG_NOTTEXT);
/* Wide character types. */
builtin_type->builtin_char16
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index ee9fc79dd6..cdd136ef52 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -963,6 +963,18 @@ struct type
this->field (0).set_type (index_type);
}
+ /* Return the instance flags converted to the correct type. */
+ const type_instance_flags instance_flags () const
+ {
+ return (enum type_instance_flag_value) this->m_instance_flags;
+ }
+
+ /* Set the instance flags. */
+ void set_instance_flags (type_instance_flags flags)
+ {
+ this->m_instance_flags = flags;
+ }
+
/* Get the bounds bounds of this type. The type must be a range type. */
range_bounds *bounds () const
{
@@ -1212,7 +1224,7 @@ struct type
instance flags are completely inherited from the target type. No
qualifiers can be cleared by the typedef. See also
check_typedef. */
- unsigned instance_flags : 9;
+ unsigned m_instance_flags : 9;
/* * Length of storage for a value of this type. The value is the
expression in host bytes of what sizeof(type) would return. This
@@ -1672,7 +1684,7 @@ extern void allocate_gnat_aux_type (struct type *);
TYPE_ZALLOC (type, \
sizeof (*TYPE_MAIN_TYPE (type)->type_specific.func_stuff)))
-#define TYPE_INSTANCE_FLAGS(thistype) (thistype)->instance_flags
+#define TYPE_INSTANCE_FLAGS(thistype) ((thistype)->instance_flags ())
#define TYPE_MAIN_TYPE(thistype) (thistype)->main_type
#define TYPE_TARGET_TYPE(thistype) TYPE_MAIN_TYPE(thistype)->target_type
#define TYPE_POINTER_TYPE(thistype) (thistype)->pointer_type
@@ -2205,12 +2217,14 @@ extern struct type *make_atomic_type (struct type *);
extern void replace_type (struct type *, struct type *);
-extern int address_space_name_to_int (struct gdbarch *, const char *);
+extern type_instance_flags address_space_name_to_int (struct gdbarch *,
+ const char *);
-extern const char *address_space_int_to_name (struct gdbarch *, int);
+extern const char *address_space_int_to_name (struct gdbarch *,
+ type_instance_flags);
-extern struct type *make_type_with_address_space (struct type *type,
- int space_identifier);
+extern struct type *make_type_with_address_space
+ (struct type *type, type_instance_flags space_identifier);
extern struct type *lookup_memberptr_type (struct type *, struct type *);
diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c
index fc374bcd56..b95c8c1359 100644
--- a/gdb/s390-tdep.c
+++ b/gdb/s390-tdep.c
@@ -1583,7 +1583,7 @@ s390_addr_bits_remove (struct gdbarch *gdbarch, CORE_ADDR addr)
/* Implement addr_class_type_flags gdbarch method.
Only used for ABI_LINUX_ZSERIES. */
-static int
+static type_instance_flags
s390_address_class_type_flags (int byte_size, int dwarf2_addr_class)
{
if (byte_size == 4)
@@ -1596,7 +1596,8 @@ s390_address_class_type_flags (int byte_size, int dwarf2_addr_class)
Only used for ABI_LINUX_ZSERIES. */
static const char *
-s390_address_class_type_flags_to_name (struct gdbarch *gdbarch, int type_flags)
+s390_address_class_type_flags_to_name (struct gdbarch *gdbarch,
+ type_instance_flags type_flags)
{
if (type_flags & TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1)
return "mode32";
@@ -1607,18 +1608,18 @@ s390_address_class_type_flags_to_name (struct gdbarch *gdbarch, int type_flags)
/* Implement addr_class_name_to_type_flags gdbarch method.
Only used for ABI_LINUX_ZSERIES. */
-static int
+static bool
s390_address_class_name_to_type_flags (struct gdbarch *gdbarch,
const char *name,
- int *type_flags_ptr)
+ type_instance_flags *type_flags_ptr)
{
if (strcmp (name, "mode32") == 0)
{
*type_flags_ptr = TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1;
- return 1;
+ return true;
}
else
- return 0;
+ return false;
}
/* Inferior function calls. */
diff --git a/gdb/stabsread.c b/gdb/stabsread.c
index 2f9458ce18..02fc8ccfd2 100644
--- a/gdb/stabsread.c
+++ b/gdb/stabsread.c
@@ -4398,7 +4398,7 @@ cleanup_undefined_types_noname (struct objfile *objfile)
and needs to be copied over from the reference type.
Since replace_type expects them to be identical, we need
to set these flags manually before hand. */
- TYPE_INSTANCE_FLAGS (nat.type) = TYPE_INSTANCE_FLAGS (*type);
+ nat.type->set_instance_flags ((*type)->instance_flags ());
replace_type (nat.type, *type);
}
}
diff --git a/gdb/type-stack.c b/gdb/type-stack.c
index f8661d7565..608142c849 100644
--- a/gdb/type-stack.c
+++ b/gdb/type-stack.c
@@ -109,7 +109,7 @@ type_stack::follow_types (struct type *follow_type)
int done = 0;
int make_const = 0;
int make_volatile = 0;
- int make_addr_space = 0;
+ type_instance_flags make_addr_space = 0;
bool make_restrict = false;
bool make_atomic = false;
int array_size;
@@ -128,7 +128,7 @@ type_stack::follow_types (struct type *follow_type)
make_volatile = 1;
break;
case tp_space_identifier:
- make_addr_space = pop_int ();
+ make_addr_space = (enum type_instance_flag_value) pop_int ();
break;
case tp_atomic:
make_atomic = true;
--
2.14.5
^ permalink raw reply [flat|nested] 14+ messages in thread
* [pushed v2 2/4] Rename address_space_int_to_name/address_space_name_to_int
2020-09-14 21:31 [pushed v2 0/4] Rewrite enum_flags, add unit tests, fix problems Pedro Alves
2020-09-14 21:31 ` [pushed v2 1/4] Use type_instance_flags more throughout Pedro Alves
@ 2020-09-14 21:31 ` Pedro Alves
2020-09-14 21:31 ` [pushed v2 3/4] Rewrite valid-expr.h's internals in terms of the detection idiom (C++17/N4502) Pedro Alves
2020-09-14 21:31 ` [pushed v2 4/4] Rewrite enum_flags, add unit tests, fix problems Pedro Alves
3 siblings, 0 replies; 14+ messages in thread
From: Pedro Alves @ 2020-09-14 21:31 UTC (permalink / raw)
To: gdb-patches
These methods now take/return a type_instance_flags instead of a raw
integer, so rename them accordingly.
gdb/ChangeLog:
* c-typeprint.c (c_type_print_modifier): Adjust to rename.
* gdbtypes.c (address_space_name_to_int): Rename to ...
(address_space_name_to_type_instance_flags): ... this.
(address_space_int_to_name): Rename to ...
(address_space_type_instance_flags_to_name): ... this.
* gdbtypes.h (address_space_name_to_int): Rename to ...
(address_space_name_to_type_instance_flags): ... this.
(address_space_int_to_name): Rename to ...
(address_space_type_instance_flags_to_name): ... this.
* type-stack.c (type_stack::insert): Adjust to rename.
* type-stack.h (type_stack::insert): Likewise.
---
gdb/ChangeLog | 14 ++++++++++++++
gdb/c-typeprint.c | 5 +++--
gdb/gdbtypes.c | 16 ++++++++--------
gdb/gdbtypes.h | 8 ++++----
gdb/type-stack.c | 5 +++--
gdb/type-stack.h | 10 +++++-----
6 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7d4800b0b0..cb435c1fd7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,17 @@
+2020-09-14 Pedro Alves <pedro@palves.net>
+
+ * c-typeprint.c (c_type_print_modifier): Adjust to rename.
+ * gdbtypes.c (address_space_name_to_int): Rename to ...
+ (address_space_name_to_type_instance_flags): ... this.
+ (address_space_int_to_name): Rename to ...
+ (address_space_type_instance_flags_to_name): ... this.
+ * gdbtypes.h (address_space_name_to_int): Rename to ...
+ (address_space_name_to_type_instance_flags): ... this.
+ (address_space_int_to_name): Rename to ...
+ (address_space_type_instance_flags_to_name): ... this.
+ * type-stack.c (type_stack::insert): Adjust to rename.
+ * type-stack.h (type_stack::insert): Likewise.
+
2020-09-14 Pedro Alves <pedro@palves.net>
Andrew Burgess <andrew.burgess@embecosm.com>
diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index b642c88178..a07b29a95d 100644
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -526,8 +526,9 @@ c_type_print_modifier (struct type *type, struct ui_file *stream,
did_print_modifier = 1;
}
- address_space_id = address_space_int_to_name (get_type_arch (type),
- TYPE_INSTANCE_FLAGS (type));
+ address_space_id
+ = address_space_type_instance_flags_to_name (get_type_arch (type),
+ TYPE_INSTANCE_FLAGS (type));
if (address_space_id)
{
if (did_print_modifier || need_pre_space)
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index b57353dec3..7ade2ccb53 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -575,12 +575,12 @@ lookup_function_type_with_arguments (struct type *type,
return fn;
}
-/* Identify address space identifier by name --
- return the integer flag defined in gdbtypes.h. */
+/* Identify address space identifier by name -- return a
+ type_instance_flags. */
type_instance_flags
-address_space_name_to_int (struct gdbarch *gdbarch,
- const char *space_identifier)
+address_space_name_to_type_instance_flags (struct gdbarch *gdbarch,
+ const char *space_identifier)
{
type_instance_flags type_flags;
@@ -598,12 +598,12 @@ address_space_name_to_int (struct gdbarch *gdbarch,
error (_("Unknown address space specifier: \"%s\""), space_identifier);
}
-/* Identify address space identifier by integer flag as defined in
- gdbtypes.h -- return the string version of the adress space name. */
+/* Identify address space identifier by type_instance_flags and return
+ the string version of the adress space name. */
const char *
-address_space_int_to_name (struct gdbarch *gdbarch,
- type_instance_flags space_flag)
+address_space_type_instance_flags_to_name (struct gdbarch *gdbarch,
+ type_instance_flags space_flag)
{
if (space_flag & TYPE_INSTANCE_FLAG_CODE_SPACE)
return "code";
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index cdd136ef52..6b87de307b 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -2217,11 +2217,11 @@ extern struct type *make_atomic_type (struct type *);
extern void replace_type (struct type *, struct type *);
-extern type_instance_flags address_space_name_to_int (struct gdbarch *,
- const char *);
+extern type_instance_flags address_space_name_to_type_instance_flags
+ (struct gdbarch *, const char *);
-extern const char *address_space_int_to_name (struct gdbarch *,
- type_instance_flags);
+extern const char *address_space_type_instance_flags_to_name
+ (struct gdbarch *, type_instance_flags);
extern struct type *make_type_with_address_space
(struct type *type, type_instance_flags space_identifier);
diff --git a/gdb/type-stack.c b/gdb/type-stack.c
index 608142c849..94ff9ba8c9 100644
--- a/gdb/type-stack.c
+++ b/gdb/type-stack.c
@@ -67,8 +67,9 @@ type_stack::insert (struct expr_builder *pstate, const char *string)
element.piece = tp_space_identifier;
insert_into (slot, element);
- element.int_val = address_space_name_to_int (pstate->gdbarch (),
- string);
+ element.int_val
+ = address_space_name_to_type_instance_flags (pstate->gdbarch (),
+ string);
insert_into (slot, element);
}
diff --git a/gdb/type-stack.h b/gdb/type-stack.h
index 8060f2fea7..265178fc37 100644
--- a/gdb/type-stack.h
+++ b/gdb/type-stack.h
@@ -157,11 +157,11 @@ struct type_stack
/* Insert a tp_space_identifier and the corresponding address space
value into the stack. STRING is the name of an address space, as
- recognized by address_space_name_to_int. If the stack is empty,
- the new elements are simply pushed. If the stack is not empty,
- this function assumes that the first item on the stack is a
- tp_pointer, and the new values are inserted above the first
- item. */
+ recognized by address_space_name_to_type_instance_flags. If the
+ stack is empty, the new elements are simply pushed. If the stack
+ is not empty, this function assumes that the first item on the
+ stack is a tp_pointer, and the new values are inserted above the
+ first item. */
void insert (struct expr_builder *pstate, const char *string);
--
2.14.5
^ permalink raw reply [flat|nested] 14+ messages in thread
* [pushed v2 3/4] Rewrite valid-expr.h's internals in terms of the detection idiom (C++17/N4502)
2020-09-14 21:31 [pushed v2 0/4] Rewrite enum_flags, add unit tests, fix problems Pedro Alves
2020-09-14 21:31 ` [pushed v2 1/4] Use type_instance_flags more throughout Pedro Alves
2020-09-14 21:31 ` [pushed v2 2/4] Rename address_space_int_to_name/address_space_name_to_int Pedro Alves
@ 2020-09-14 21:31 ` Pedro Alves
2020-09-17 10:57 ` Vaseeharan Vinayagamoorthy
2020-09-14 21:31 ` [pushed v2 4/4] Rewrite enum_flags, add unit tests, fix problems Pedro Alves
3 siblings, 1 reply; 14+ messages in thread
From: Pedro Alves @ 2020-09-14 21:31 UTC (permalink / raw)
To: gdb-patches
An earlier attempt at doing this had failed (wouldn't work in GCCs
around 4.8, IIRC), but now that I try again, it works. I suspect that
my previous attempt did not use the pre C++14-safe void_t (in
traits.h).
I want to switch to this model because:
- It's the standard detection idiom that folks will learn starting
with C++17.
- In the enum_flags unit tests, I have a static_assert that triggers
a warning (resulting in build error), which GCC does not suppress
because the warning is not being triggered in the SFINAE context.
Switching to the detection idiom fixes that. Alternatively,
switching to the C++03-style expression-validity checking with a
varargs overload would allow addressing that, but I think that
would be going backwards idiomatically speaking.
- While this patch shows a net increase of lines of code, the magic
being added to traits.h can be removed in a few years when we start
requiring C++17.
gdbsupport/ChangeLog:
* traits.h (struct nonesuch, struct detector, detected_or)
(detected_or_t, is_detected, detected_t, detected_or)
(detected_or_t, is_detected_exact, is_detected_convertible): New.
* valid-expr.h (CHECK_VALID_EXPR_INT): Use gdb::is_detected_exact.
---
gdbsupport/ChangeLog | 7 ++++++
gdbsupport/traits.h | 67 +++++++++++++++++++++++++++++++++++++++++++++++++
gdbsupport/valid-expr.h | 20 +++------------
3 files changed, 77 insertions(+), 17 deletions(-)
diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog
index 6cda6050f9..4858cc6b56 100644
--- a/gdbsupport/ChangeLog
+++ b/gdbsupport/ChangeLog
@@ -1,3 +1,10 @@
+2020-09-14 Pedro Alves <pedro@palves.net>
+
+ * traits.h (struct nonesuch, struct detector, detected_or)
+ (detected_or_t, is_detected, detected_t, detected_or)
+ (detected_or_t, is_detected_exact, is_detected_convertible): New.
+ * valid-expr.h (CHECK_VALID_EXPR_INT): Use gdb::is_detected_exact.
+
2020-09-10 Kamil Rytarowski <n54@gmx.com>
* eintr.h: New file.
diff --git a/gdbsupport/traits.h b/gdbsupport/traits.h
index 2a6f00654c..93b609ac10 100644
--- a/gdbsupport/traits.h
+++ b/gdbsupport/traits.h
@@ -52,6 +52,73 @@ struct make_void { typedef void type; };
template<typename... Ts>
using void_t = typename make_void<Ts...>::type;
+/* Implementation of the detection idiom:
+
+ - http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4502.pdf
+ - http://en.cppreference.com/w/cpp/experimental/is_detected
+
+*/
+
+struct nonesuch
+{
+ nonesuch () = delete;
+ ~nonesuch () = delete;
+ nonesuch (const nonesuch &) = delete;
+ void operator= (const nonesuch &) = delete;
+};
+
+namespace detection_detail {
+/* Implementation of the detection idiom (negative case). */
+template<typename Default, typename AlwaysVoid,
+ template<typename...> class Op, typename... Args>
+struct detector
+{
+ using value_t = std::false_type;
+ using type = Default;
+};
+
+/* Implementation of the detection idiom (positive case). */
+template<typename Default, template<typename...> class Op, typename... Args>
+struct detector<Default, void_t<Op<Args...>>, Op, Args...>
+{
+ using value_t = std::true_type;
+ using type = Op<Args...>;
+};
+
+/* Detect whether Op<Args...> is a valid type, use Default if not. */
+template<typename Default, template<typename...> class Op,
+ typename... Args>
+using detected_or = detector<Default, void, Op, Args...>;
+
+/* Op<Args...> if that is a valid type, otherwise Default. */
+template<typename Default, template<typename...> class Op,
+ typename... Args>
+using detected_or_t
+ = typename detected_or<Default, Op, Args...>::type;
+
+} /* detection_detail */
+
+template<template<typename...> class Op, typename... Args>
+using is_detected
+ = typename detection_detail::detector<nonesuch, void, Op, Args...>::value_t;
+
+template<template<typename...> class Op, typename... Args>
+using detected_t
+ = typename detection_detail::detector<nonesuch, void, Op, Args...>::type;
+
+template<typename Default, template<typename...> class Op, typename... Args>
+using detected_or = detection_detail::detected_or<Default, Op, Args...>;
+
+template<typename Default, template<typename...> class Op, typename... Args>
+using detected_or_t = typename detected_or<Default, Op, Args...>::type;
+
+template<typename Expected, template<typename...> class Op, typename... Args>
+using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
+
+template<typename To, template<typename...> class Op, typename... Args>
+using is_detected_convertible
+ = std::is_convertible<detected_t<Op, Args...>, To>;
+
/* A few trait helpers, mainly stolen from libstdc++. Uppercase
because "and/or", etc. are reserved keywords. */
diff --git a/gdbsupport/valid-expr.h b/gdbsupport/valid-expr.h
index b1c8446814..a22fa61134 100644
--- a/gdbsupport/valid-expr.h
+++ b/gdbsupport/valid-expr.h
@@ -58,26 +58,12 @@
#define CHECK_VALID_EXPR_INT(TYPENAMES, TYPES, VALID, EXPR_TYPE, EXPR) \
namespace CONCAT (check_valid_expr, __LINE__) { \
\
- template<typename, typename, typename = void> \
- struct is_valid_expression \
- : std::false_type {}; \
- \
template <TYPENAMES> \
- struct is_valid_expression<TYPES, gdb::void_t<decltype (EXPR)>> \
- : std::true_type {}; \
+ using archetype = decltype (EXPR); \
\
- static_assert (is_valid_expression<TYPES>::value == VALID, \
+ static_assert (gdb::is_detected_exact<EXPR_TYPE, \
+ archetype, TYPES>::value == VALID, \
""); \
- \
- template<TYPENAMES, typename = void> \
- struct is_same_type \
- : std::is_same<EXPR_TYPE, void> {}; \
- \
- template <TYPENAMES> \
- struct is_same_type<TYPES, gdb::void_t<decltype (EXPR)>> \
- : std::is_same<EXPR_TYPE, decltype (EXPR)> {}; \
- \
- static_assert (is_same_type<TYPES>::value, ""); \
} /* namespace */
/* A few convenience macros that support expressions involving a
--
2.14.5
^ permalink raw reply [flat|nested] 14+ messages in thread
* [pushed v2 4/4] Rewrite enum_flags, add unit tests, fix problems
2020-09-14 21:31 [pushed v2 0/4] Rewrite enum_flags, add unit tests, fix problems Pedro Alves
` (2 preceding siblings ...)
2020-09-14 21:31 ` [pushed v2 3/4] Rewrite valid-expr.h's internals in terms of the detection idiom (C++17/N4502) Pedro Alves
@ 2020-09-14 21:31 ` Pedro Alves
3 siblings, 0 replies; 14+ messages in thread
From: Pedro Alves @ 2020-09-14 21:31 UTC (permalink / raw)
To: gdb-patches
This patch started by adding comprehensive unit tests for enum_flags.
For the testing part, it adds:
- tests of normal expected uses of the API.
- checks that _invalid_ uses of the API would fail to compile. I.e.,
it validates that enum_flags really is a strong type, and that
incorrect mixing of enum types would be caught at compile time. It
pulls that off making use of SFINEA and C++11's decltype/constexpr.
This revealed many holes in the enum_flags API. For example, the f1
assignment below currently incorrectly fails to compile:
enum_flags<flags> f1 = FLAG1;
enum_flags<flags> f2 = FLAG2 | f1;
The unit tests also revealed that this useful use case doesn't work:
enum flag { FLAG1 = 1, FLAG2 = 2 };
enum_flags<flag> src = FLAG1;
enum_flags<flag> f1 = condition ? src : FLAG2;
It fails to compile because enum_flags<flag> and flag are convertible
to each other.
Turns out that making enum_flags be implicitly convertible to the
backing raw enum type was not a good idea.
If we make it convertible to the underlying type instead, we fix that
ternary operator use case, and, we find cases throughout the codebase
that should be using the enum_flags but were using the raw backing
enum instead. So it's a good change overall.
Also, several operators were missing.
These holes and more are plugged by this patch, by reworking how the
enum_flags operators are implemented, and making use of C++11's
feature of being able to delete methods/functions.
There are cases in gdb/compile/ where we need to call a function in a
C plugin API that expects the raw enum. To address cases like that,
this adds a "raw()" method to enum_flags. This way we can keep using
the safer enum_flags to construct the value, and then be explicit when
we need to get at the raw enum.
This makes most of the enum_flags operators constexpr. Beyond
enabling more compiler optimizations and enabling the new unit tests,
this has other advantages, like making it possible to use operator|
with enum_flags values in switch cases, where only compile-time
constants are allowed:
enum_flags<flags> f = FLAG1 | FLAG2;
switch (f)
{
case FLAG1 | FLAG2:
break;
}
Currently that fails to compile.
It also switches to a different mechanism of enabling the global
operators. The current mechanism isn't namespace friendly, the new
one is.
It also switches to C++11-style SFINAE -- instead of wrapping the
return type in a SFINAE-friently structure, we use an unnamed template
parameter. I.e., this:
template <typename enum_type,
typename = is_enum_flags_enum_type_t<enum_type>>
enum_type
operator& (enum_type e1, enum_type e2)
instead of:
template <typename enum_type>
typename enum_flags_type<enum_type>::type
operator& (enum_type e1, enum_type e2)
Note that the static_assert inside operator~() was converted to a
couple overloads (signed vs unsigned), because static_assert is too
late for SFINAE-based tests, which is important for the CHECK_VALID
unit tests.
Tested with gcc {4.8, 7.1, 9.3} and clang {5.0.2, 10.0.0}.
gdb/ChangeLog:
* Makefile.in (SELFTESTS_SRCS): Add
unittests/enum-flags-selftests.c.
* btrace.c (ftrace_update_caller, ftrace_fixup_calle): Use
btrace_function_flags instead of enum btrace_function_flag.
* compile/compile-c-types.c (convert_qualified): Use
enum_flags::raw.
* compile/compile-cplus-symbols.c (convert_one_symbol)
(convert_symbol_bmsym):
* compile/compile-cplus-types.c (compile_cplus_convert_method)
(compile_cplus_convert_struct_or_union_methods)
(compile_cplus_instance::convert_qualified_base):
* go-exp.y (parse_string_or_char): Add cast to int.
* unittests/enum-flags-selftests.c: New file.
* record-btrace.c (btrace_thread_flag_to_str): Change parameter's
type to btrace_thread_flags from btrace_thread_flag.
(record_btrace_cancel_resume, record_btrace_step_thread): Change
local's type to btrace_thread_flags from btrace_thread_flag. Add
cast in DEBUG call.
gdbsupport/ChangeLog:
* enum-flags.h: Include "traits.h".
(DEF_ENUM_FLAGS_TYPE): Declare a function instead of defining a
structure.
(enum_underlying_type): Update comment.
(namespace enum_flags_detail): New. Move struct zero_type here.
(EnumIsUnsigned, EnumIsSigned): New.
(class enum_flags): Make most methods constexpr.
(operator&=, operator|=, operator^=): Take an enum_flags instead
of an enum_type. Make rvalue ref versions deleted.
(operator enum_type()): Delete.
(operator&, operator|, operator^, operator~): Delete, moved out of
class.
(raw()): New method.
(is_enum_flags_enum_type_t): Declare.
(ENUM_FLAGS_GEN_BINOP, ENUM_FLAGS_GEN_COMPOUND_ASSIGN)
(ENUM_FLAGS_GEN_COMP): New. Use them to reimplement global
operators.
(operator~): Now constexpr and reimplemented.
(operator<<, operator>>): New deleted functions.
* valid-expr.h (CHECK_VALID_EXPR_5, CHECK_VALID_EXPR_6): New.
---
gdb/ChangeLog | 21 ++
gdbsupport/ChangeLog | 23 ++
gdb/Makefile.in | 1 +
gdb/btrace.c | 4 +-
gdb/compile/compile-c-types.c | 3 +-
gdb/compile/compile-cplus-symbols.c | 4 +-
gdb/compile/compile-cplus-types.c | 10 +-
gdb/go-exp.y | 2 +-
gdb/record-btrace.c | 10 +-
gdb/unittests/enum-flags-selftests.c | 586 +++++++++++++++++++++++++++++++++++
gdbsupport/enum-flags.h | 370 +++++++++++++++++-----
gdbsupport/valid-expr.h | 15 +
12 files changed, 951 insertions(+), 98 deletions(-)
create mode 100644 gdb/unittests/enum-flags-selftests.c
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cb435c1fd7..45c7125226 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,24 @@
+2020-09-14 Pedro Alves <pedro@palves.net>
+
+ * Makefile.in (SELFTESTS_SRCS): Add
+ unittests/enum-flags-selftests.c.
+ * btrace.c (ftrace_update_caller, ftrace_fixup_calle): Use
+ btrace_function_flags instead of enum btrace_function_flag.
+ * compile/compile-c-types.c (convert_qualified): Use
+ enum_flags::raw.
+ * compile/compile-cplus-symbols.c (convert_one_symbol)
+ (convert_symbol_bmsym):
+ * compile/compile-cplus-types.c (compile_cplus_convert_method)
+ (compile_cplus_convert_struct_or_union_methods)
+ (compile_cplus_instance::convert_qualified_base):
+ * go-exp.y (parse_string_or_char): Add cast to int.
+ * unittests/enum-flags-selftests.c: New file.
+ * record-btrace.c (btrace_thread_flag_to_str): Change parameter's
+ type to btrace_thread_flags from btrace_thread_flag.
+ (record_btrace_cancel_resume, record_btrace_step_thread): Change
+ local's type to btrace_thread_flags from btrace_thread_flag. Add
+ cast in DEBUG call.
+
2020-09-14 Pedro Alves <pedro@palves.net>
* c-typeprint.c (c_type_print_modifier): Adjust to rename.
diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog
index 4858cc6b56..2c35ee709a 100644
--- a/gdbsupport/ChangeLog
+++ b/gdbsupport/ChangeLog
@@ -1,3 +1,26 @@
+2020-09-14 Pedro Alves <pedro@palves.net>
+
+ * enum-flags.h: Include "traits.h".
+ (DEF_ENUM_FLAGS_TYPE): Declare a function instead of defining a
+ structure.
+ (enum_underlying_type): Update comment.
+ (namespace enum_flags_detail): New. Move struct zero_type here.
+ (EnumIsUnsigned, EnumIsSigned): New.
+ (class enum_flags): Make most methods constexpr.
+ (operator&=, operator|=, operator^=): Take an enum_flags instead
+ of an enum_type. Make rvalue ref versions deleted.
+ (operator enum_type()): Delete.
+ (operator&, operator|, operator^, operator~): Delete, moved out of
+ class.
+ (raw()): New method.
+ (is_enum_flags_enum_type_t): Declare.
+ (ENUM_FLAGS_GEN_BINOP, ENUM_FLAGS_GEN_COMPOUND_ASSIGN)
+ (ENUM_FLAGS_GEN_COMP): New. Use them to reimplement global
+ operators.
+ (operator~): Now constexpr and reimplemented.
+ (operator<<, operator>>): New deleted functions.
+ * valid-expr.h (CHECK_VALID_EXPR_5, CHECK_VALID_EXPR_6): New.
+
2020-09-14 Pedro Alves <pedro@palves.net>
* traits.h (struct nonesuch, struct detector, detected_or)
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 4808357e65..dbede7a9cf 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -435,6 +435,7 @@ SELFTESTS_SRCS = \
unittests/command-def-selftests.c \
unittests/common-utils-selftests.c \
unittests/copy_bitwise-selftests.c \
+ unittests/enum-flags-selftests.c \
unittests/environ-selftests.c \
unittests/filtered_iterator-selftests.c \
unittests/format_pieces-selftests.c \
diff --git a/gdb/btrace.c b/gdb/btrace.c
index 2a0c61de76..9022aedd1c 100644
--- a/gdb/btrace.c
+++ b/gdb/btrace.c
@@ -265,7 +265,7 @@ ftrace_new_function (struct btrace_thread_info *btinfo,
static void
ftrace_update_caller (struct btrace_function *bfun,
struct btrace_function *caller,
- enum btrace_function_flag flags)
+ btrace_function_flags flags)
{
if (bfun->up != 0)
ftrace_debug (bfun, "updating caller");
@@ -283,7 +283,7 @@ static void
ftrace_fixup_caller (struct btrace_thread_info *btinfo,
struct btrace_function *bfun,
struct btrace_function *caller,
- enum btrace_function_flag flags)
+ btrace_function_flags flags)
{
unsigned int prev, next;
diff --git a/gdb/compile/compile-c-types.c b/gdb/compile/compile-c-types.c
index 6d9bb37b17..6c9135947e 100644
--- a/gdb/compile/compile-c-types.c
+++ b/gdb/compile/compile-c-types.c
@@ -254,7 +254,8 @@ convert_qualified (compile_c_instance *context, struct type *type)
if (TYPE_RESTRICT (type))
quals |= GCC_QUALIFIER_RESTRICT;
- return context->plugin ().build_qualified_type (unqual_converted, quals);
+ return context->plugin ().build_qualified_type (unqual_converted,
+ quals.raw ());
}
/* Convert a complex type to its gcc representation. */
diff --git a/gdb/compile/compile-cplus-symbols.c b/gdb/compile/compile-cplus-symbols.c
index 1998584791..6b905f3dfc 100644
--- a/gdb/compile/compile-cplus-symbols.c
+++ b/gdb/compile/compile-cplus-symbols.c
@@ -208,7 +208,7 @@ convert_one_symbol (compile_cplus_instance *instance,
/* Define the decl. */
instance->plugin ().build_decl
- ("variable", name.c_str (), kind, sym_type,
+ ("variable", name.c_str (), kind.raw (), sym_type,
symbol_name.get (), addr, filename, line);
/* Pop scope for non-local symbols. */
@@ -323,7 +323,7 @@ convert_symbol_bmsym (compile_cplus_instance *instance,
sym_type = instance->convert_type (type);
instance->plugin ().push_namespace ("");
instance->plugin ().build_decl
- ("minsym", msym->natural_name (), kind, sym_type, nullptr, addr,
+ ("minsym", msym->natural_name (), kind.raw (), sym_type, nullptr, addr,
nullptr, 0);
instance->plugin ().pop_binding_level ("");
}
diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-types.c
index bb4b267e9a..2d4352f6c2 100644
--- a/gdb/compile/compile-cplus-types.c
+++ b/gdb/compile/compile-cplus-types.c
@@ -668,7 +668,7 @@ compile_cplus_convert_method (compile_cplus_instance *instance,
type and corresponding qualifier flags. */
gcc_type func_type = compile_cplus_convert_func (instance, method_type, true);
gcc_type class_type = instance->convert_type (parent_type);
- gcc_cp_qualifiers_flags quals = (enum gcc_cp_qualifiers) 0;
+ gcc_cp_qualifiers_flags quals = 0;
if (TYPE_CONST (method_type))
quals |= GCC_CP_QUALIFIER_CONST;
@@ -681,7 +681,7 @@ compile_cplus_convert_method (compile_cplus_instance *instance,
gcc_cp_ref_qualifiers_flags rquals = GCC_CP_REF_QUAL_NONE;
return instance->plugin ().build_method_type
- (class_type, func_type, quals, rquals);
+ (class_type, func_type, quals.raw (), rquals.raw ());
}
/* Convert a member or method pointer represented by TYPE. */
@@ -745,7 +745,7 @@ compile_cplus_convert_struct_or_union_methods (compile_cplus_instance *instance,
(sym_kind
| get_method_access_flag (type, i, j)
| GCC_CP_FLAG_VIRTUAL_FUNCTION
- | GCC_CP_FLAG_PURE_VIRTUAL_FUNCTION),
+ | GCC_CP_FLAG_PURE_VIRTUAL_FUNCTION).raw (),
method_type, nullptr, 0, nullptr, 0);
continue;
}
@@ -787,7 +787,7 @@ compile_cplus_convert_struct_or_union_methods (compile_cplus_instance *instance,
instance->plugin ().build_decl
(kind, overloaded_name.get (),
- sym_kind | get_method_access_flag (type, i, j),
+ (sym_kind | get_method_access_flag (type, i, j)).raw (),
method_type, nullptr, address, filename, line);
}
}
@@ -1060,7 +1060,7 @@ compile_cplus_instance::convert_qualified_base (gcc_type base,
gcc_type result = base;
if (quals != 0)
- result = plugin ().build_qualified_type (base, quals);
+ result = plugin ().build_qualified_type (base, quals.raw ());
return result;
}
diff --git a/gdb/go-exp.y b/gdb/go-exp.y
index 17c76ac02a..ee1db2b587 100644
--- a/gdb/go-exp.y
+++ b/gdb/go-exp.y
@@ -924,7 +924,7 @@ parse_string_or_char (const char *tokptr, const char **outptr,
}
++tokptr;
- value->type = C_STRING | (quote == '\'' ? C_CHAR : 0); /*FIXME*/
+ value->type = (int) C_STRING | (quote == '\'' ? C_CHAR : 0); /*FIXME*/
value->ptr = (char *) obstack_base (&tempbuf);
value->length = obstack_object_size (&tempbuf);
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
index a1a3efc3d6..fd0d13fb25 100644
--- a/gdb/record-btrace.c
+++ b/gdb/record-btrace.c
@@ -1928,7 +1928,7 @@ record_btrace_target::get_tailcall_unwinder ()
/* Return a human-readable string for FLAG. */
static const char *
-btrace_thread_flag_to_str (enum btrace_thread_flag flag)
+btrace_thread_flag_to_str (btrace_thread_flags flag)
{
switch (flag)
{
@@ -2221,7 +2221,7 @@ record_btrace_target::commit_resume ()
static void
record_btrace_cancel_resume (struct thread_info *tp)
{
- enum btrace_thread_flag flags;
+ btrace_thread_flags flags;
flags = tp->btrace.flags & (BTHR_MOVE | BTHR_STOP);
if (flags == 0)
@@ -2229,7 +2229,7 @@ record_btrace_cancel_resume (struct thread_info *tp)
DEBUG ("cancel resume thread %s (%s): %x (%s)",
print_thread_id (tp),
- target_pid_to_str (tp->ptid).c_str (), flags,
+ target_pid_to_str (tp->ptid).c_str (), flags.raw (),
btrace_thread_flag_to_str (flags));
tp->btrace.flags &= ~(BTHR_MOVE | BTHR_STOP);
@@ -2449,7 +2449,7 @@ record_btrace_step_thread (struct thread_info *tp)
{
struct btrace_thread_info *btinfo;
struct target_waitstatus status;
- enum btrace_thread_flag flags;
+ btrace_thread_flags flags;
btinfo = &tp->btrace;
@@ -2457,7 +2457,7 @@ record_btrace_step_thread (struct thread_info *tp)
btinfo->flags &= ~(BTHR_MOVE | BTHR_STOP);
DEBUG ("stepping thread %s (%s): %x (%s)", print_thread_id (tp),
- target_pid_to_str (tp->ptid).c_str (), flags,
+ target_pid_to_str (tp->ptid).c_str (), flags.raw (),
btrace_thread_flag_to_str (flags));
/* We can't step without an execution history. */
diff --git a/gdb/unittests/enum-flags-selftests.c b/gdb/unittests/enum-flags-selftests.c
new file mode 100644
index 0000000000..af585f04ae
--- /dev/null
+++ b/gdb/unittests/enum-flags-selftests.c
@@ -0,0 +1,586 @@
+/* Self tests for enum-flags for GDB, the GNU debugger.
+
+ Copyright (C) 2016-2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+#include "gdbsupport/enum-flags.h"
+#include "gdbsupport/valid-expr.h"
+#include "gdbsupport/selftest.h"
+
+namespace selftests {
+namespace enum_flags_tests {
+
+/* The (real) enum types used in CHECK_VALID. Their names match the
+ template parameter names of the templates defined by CHECK_VALID to
+ make it simpler to use. They could be named differently. */
+
+/* A "real enum". */
+enum RE
+ {
+ RE_FLAG1 = 1 << 1,
+ RE_FLAG2 = 1 << 2,
+ };
+
+/* Another "real enum". */
+enum RE2
+ {
+ RE2_FLAG1 = 1 << 1,
+ RE2_FLAG2 = 1 << 2,
+ };
+
+/* An unsigned "real enum". */
+enum URE : unsigned
+ {
+ URE_FLAG1 = 1 << 1,
+ URE_FLAG2 = 1 << 2,
+ URE_FLAG3 = 0xffffffff,
+ };
+
+/* A non-flags enum. */
+enum NF
+ {
+ NF_FLAG1 = 1 << 1,
+ NF_FLAG2 = 1 << 2,
+ };
+
+/* The corresponding "enum flags" types. */
+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. */
+gdb_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
+ follow. */
+static RE re ATTRIBUTE_UNUSED;
+static EF ef ATTRIBUTE_UNUSED;
+
+/* First, compile-time tests that:
+
+ - make sure that incorrect operations with mismatching enum types
+ are caught at compile time.
+
+ - make sure that the same operations but involving the right enum
+ types do compile and that they return the correct type.
+*/
+
+#define CHECK_VALID(VALID, EXPR_TYPE, EXPR) \
+ CHECK_VALID_EXPR_6 (EF, RE, EF2, RE2, UEF, URE, VALID, EXPR_TYPE, EXPR)
+
+typedef std::underlying_type<RE>::type und;
+
+/* Test construction / conversion from/to different types. */
+
+/* RE/EF -> underlying (explicit) */
+CHECK_VALID (true, und, und (RE ()))
+CHECK_VALID (true, und, und (EF ()))
+
+/* RE/EF -> int (explicit) */
+CHECK_VALID (true, int, int (RE ()))
+CHECK_VALID (true, int, int (EF ()))
+
+/* other -> RE */
+
+/* You can construct a raw enum value from an int explicitly to punch
+ a hole in the type system if need to. */
+CHECK_VALID (true, RE, RE (1))
+CHECK_VALID (true, RE, RE (RE2 ()))
+CHECK_VALID (false, void, RE (EF2 ()))
+CHECK_VALID (true, RE, RE (RE ()))
+CHECK_VALID (false, void, RE (EF ()))
+
+/* other -> EF. */
+
+/* As expected, enum-flags is a stronger type than the backing raw
+ enum. Unlike with raw enums, you can't construct an enum flags
+ from an integer nor from an unrelated enum type explicitly. Add an
+ intermediate conversion via the raw enum if you really need it. */
+CHECK_VALID (false, void, EF (1))
+CHECK_VALID (false, void, EF (1u))
+CHECK_VALID (false, void, EF (RE2 ()))
+CHECK_VALID (false, void, EF (EF2 ()))
+CHECK_VALID (true, EF, EF (RE ()))
+CHECK_VALID (true, EF, EF (EF ()))
+
+/* Test operators. */
+
+/* operator OP (raw_enum, int) */
+
+CHECK_VALID (false, void, RE () | 1)
+CHECK_VALID (false, void, RE () & 1)
+CHECK_VALID (false, void, RE () ^ 1)
+
+/* operator OP (int, raw_enum) */
+
+CHECK_VALID (false, void, 1 | RE ())
+CHECK_VALID (false, void, 1 & RE ())
+CHECK_VALID (false, void, 1 ^ RE ())
+
+/* operator OP (enum_flags, int) */
+
+CHECK_VALID (false, void, EF () | 1)
+CHECK_VALID (false, void, EF () & 1)
+CHECK_VALID (false, void, EF () ^ 1)
+
+/* operator OP (int, enum_flags) */
+
+CHECK_VALID (false, void, 1 | EF ())
+CHECK_VALID (false, void, 1 & EF ())
+CHECK_VALID (false, void, 1 ^ EF ())
+
+/* operator OP (raw_enum, raw_enum) */
+
+CHECK_VALID (false, void, RE () | RE2 ())
+CHECK_VALID (false, void, RE () & RE2 ())
+CHECK_VALID (false, void, RE () ^ RE2 ())
+CHECK_VALID (true, RE, RE () | RE ())
+CHECK_VALID (true, RE, RE () & RE ())
+CHECK_VALID (true, RE, RE () ^ RE ())
+
+/* operator OP (enum_flags, raw_enum) */
+
+CHECK_VALID (false, void, EF () | RE2 ())
+CHECK_VALID (false, void, EF () & RE2 ())
+CHECK_VALID (false, void, EF () ^ RE2 ())
+CHECK_VALID (true, EF, EF () | RE ())
+CHECK_VALID (true, EF, EF () & RE ())
+CHECK_VALID (true, EF, EF () ^ RE ())
+
+/* operator OP= (raw_enum, raw_enum), rvalue ref on the lhs. */
+
+CHECK_VALID (false, void, RE () |= RE2 ())
+CHECK_VALID (false, void, RE () &= RE2 ())
+CHECK_VALID (false, void, RE () ^= RE2 ())
+CHECK_VALID (false, void, RE () |= RE ())
+CHECK_VALID (false, void, RE () &= RE ())
+CHECK_VALID (false, void, RE () ^= RE ())
+
+/* operator OP= (raw_enum, raw_enum), lvalue ref on the lhs. */
+
+CHECK_VALID (false, void, re |= RE2 ())
+CHECK_VALID (false, void, re &= RE2 ())
+CHECK_VALID (false, void, re ^= RE2 ())
+CHECK_VALID (true, RE&, re |= RE ())
+CHECK_VALID (true, RE&, re &= RE ())
+CHECK_VALID (true, RE&, re ^= RE ())
+
+/* operator OP= (enum_flags, raw_enum), rvalue ref on the lhs. */
+
+CHECK_VALID (false, void, EF () |= RE2 ())
+CHECK_VALID (false, void, EF () &= RE2 ())
+CHECK_VALID (false, void, EF () ^= RE2 ())
+CHECK_VALID (false, void, EF () |= RE ())
+CHECK_VALID (false, void, EF () &= RE ())
+CHECK_VALID (false, void, EF () ^= RE ())
+
+/* operator OP= (enum_flags, raw_enum), lvalue ref on the lhs. */
+
+CHECK_VALID (false, void, ef |= RE2 ())
+CHECK_VALID (false, void, ef &= RE2 ())
+CHECK_VALID (false, void, ef ^= RE2 ())
+CHECK_VALID (true, EF&, ef |= EF ())
+CHECK_VALID (true, EF&, ef &= EF ())
+CHECK_VALID (true, EF&, ef ^= EF ())
+
+/* operator OP= (enum_flags, enum_flags), rvalue ref on the lhs. */
+
+CHECK_VALID (false, void, EF () |= EF2 ())
+CHECK_VALID (false, void, EF () &= EF2 ())
+CHECK_VALID (false, void, EF () ^= EF2 ())
+CHECK_VALID (false, void, EF () |= EF ())
+CHECK_VALID (false, void, EF () &= EF ())
+CHECK_VALID (false, void, EF () ^= EF ())
+
+/* operator OP= (enum_flags, enum_flags), lvalue ref on the lhs. */
+
+CHECK_VALID (false, void, ef |= EF2 ())
+CHECK_VALID (false, void, ef &= EF2 ())
+CHECK_VALID (false, void, ef ^= EF2 ())
+CHECK_VALID (true, EF&, ef |= EF ())
+CHECK_VALID (true, EF&, ef &= EF ())
+CHECK_VALID (true, EF&, ef ^= EF ())
+
+/* operator~ (raw_enum) */
+
+CHECK_VALID (false, void, ~RE ())
+CHECK_VALID (true, URE, ~URE ())
+
+/* operator~ (enum_flags) */
+
+CHECK_VALID (false, void, ~EF ())
+CHECK_VALID (true, UEF, ~UEF ())
+
+/* Check ternary operator. This exercises implicit conversions. */
+
+CHECK_VALID (true, EF, true ? EF () : RE ())
+CHECK_VALID (true, EF, true ? RE () : EF ())
+
+/* These are valid, but it's not a big deal since you won't be able to
+ assign the resulting integer to an enum or an enum_flags without a
+ cast.
+
+ The latter two tests are disabled on older GCCs because they
+ incorrectly fail with gcc 4.8 and 4.9 at least. Running the test
+ outside a SFINAE context shows:
+
+ invalid user-defined conversion from ‘EF’ to ‘RE2’
+
+ They've been confirmed to compile/pass with gcc 5.3, gcc 7.1 and
+ clang 3.7. */
+
+CHECK_VALID (true, int, true ? EF () : EF2 ())
+CHECK_VALID (true, int, true ? EF2 () : EF ())
+#if GCC_VERSION >= 5003 || defined __clang__
+CHECK_VALID (true, int, true ? EF () : RE2 ())
+CHECK_VALID (true, int, true ? RE2 () : EF ())
+#endif
+
+/* Same, but with an unsigned enum. */
+
+typedef unsigned int uns;
+
+CHECK_VALID (true, uns, true ? EF () : UEF ())
+CHECK_VALID (true, uns, true ? UEF () : EF ())
+#if GCC_VERSION >= 5003 || defined __clang__
+CHECK_VALID (true, uns, true ? EF () : URE ())
+CHECK_VALID (true, uns, true ? URE () : EF ())
+#endif
+
+/* Unfortunately this can't work due to the way C++ computes the
+ return type of the ternary conditional operator. int isn't
+ implicitly convertible to the raw enum type, so the type of the
+ expression is int. And then int is not implicitly convertible to
+ enum_flags.
+
+ GCC 4.8 fails to compile this test with:
+ error: operands to ?: have different types ‘enum_flags<RE>’ and ‘int’
+ Confirmed to work with gcc 4.9, 5.3 and clang 3.7.
+*/
+#if GCC_VERSION >= 4009 || defined __clang__
+CHECK_VALID (false, void, true ? EF () : 0)
+CHECK_VALID (false, void, true ? 0 : EF ())
+#endif
+
+/* Check that the ++/--/<</>>/<<=/>>= operators are deleted. */
+
+CHECK_VALID (false, void, RE ()++)
+CHECK_VALID (false, void, ++RE ())
+CHECK_VALID (false, void, --RE ())
+CHECK_VALID (false, void, RE ()--)
+
+CHECK_VALID (false, void, RE () << 1)
+CHECK_VALID (false, void, RE () >> 1)
+CHECK_VALID (false, void, EF () << 1)
+CHECK_VALID (false, void, EF () >> 1)
+
+CHECK_VALID (false, void, RE () <<= 1)
+CHECK_VALID (false, void, RE () >>= 1)
+CHECK_VALID (false, void, EF () <<= 1)
+CHECK_VALID (false, void, EF () >>= 1)
+
+/* Test comparison operators. */
+
+CHECK_VALID (false, void, EF () == EF2 ())
+CHECK_VALID (false, void, EF () == RE2 ())
+CHECK_VALID (false, void, RE () == EF2 ())
+
+CHECK_VALID (true, bool, EF (RE (1)) == EF (RE (1)))
+CHECK_VALID (true, bool, EF (RE (1)) == RE (1))
+CHECK_VALID (true, bool, RE (1) == EF (RE (1)))
+
+CHECK_VALID (false, void, EF () != EF2 ())
+CHECK_VALID (false, void, EF () != RE2 ())
+CHECK_VALID (false, void, RE () != EF2 ())
+
+/* On clang, disable -Wenum-compare due to "error: comparison of two
+ values with different enumeration types [-Werror,-Wenum-compare]".
+ clang doesn't suppress -Wenum-compare in SFINAE contexts. Not a
+ big deal since misuses like these in GDB will be caught by -Werror
+ anyway. This check is here mainly for completeness. */
+#if defined __clang__
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wenum-compare"
+#endif
+CHECK_VALID (true, bool, RE () == RE2 ())
+CHECK_VALID (true, bool, RE () != RE2 ())
+#if defined __clang__
+# pragma GCC diagnostic pop
+#endif
+
+CHECK_VALID (true, bool, EF (RE (1)) != EF (RE (2)))
+CHECK_VALID (true, bool, EF (RE (1)) != RE (2))
+CHECK_VALID (true, bool, RE (1) != EF (RE (2)))
+
+CHECK_VALID (true, bool, EF () == 0)
+
+/* Check we didn't disable/delete comparison between non-flags enums
+ and unrelated types by mistake. */
+CHECK_VALID (true, bool, NF (1) == NF (1))
+CHECK_VALID (true, bool, NF (1) == int (1))
+CHECK_VALID (true, bool, NF (1) == char (1))
+
+/* -------------------------------------------------------------------- */
+
+/* Follows misc tests that exercise the API. Some are compile time,
+ when possible, others are run time. */
+
+enum test_flag
+ {
+ FLAG1 = 1 << 1,
+ FLAG2 = 1 << 2,
+ FLAG3 = 1 << 3,
+ };
+
+enum test_uflag : unsigned
+ {
+ UFLAG1 = 1 << 1,
+ UFLAG2 = 1 << 2,
+ UFLAG3 = 1 << 3,
+ };
+
+DEF_ENUM_FLAGS_TYPE (test_flag, test_flags);
+DEF_ENUM_FLAGS_TYPE (test_uflag, test_uflags);
+
+static void
+self_test ()
+{
+ /* Check that default construction works. */
+ {
+ constexpr test_flags f;
+
+ gdb_static_assert (f == 0);
+ }
+
+ /* Check that assignment from zero works. */
+ {
+ test_flags f (FLAG1);
+
+ SELF_CHECK (f == FLAG1);
+
+ f = 0;
+
+ SELF_CHECK (f == 0);
+ }
+
+ /* Check that construction from zero works. */
+ {
+ constexpr test_flags zero1 = 0;
+ constexpr test_flags zero2 (0);
+ constexpr test_flags zero3 {0};
+ constexpr test_flags zero4 = {0};
+
+ gdb_static_assert (zero1 == 0);
+ gdb_static_assert (zero2 == 0);
+ gdb_static_assert (zero3 == 0);
+ gdb_static_assert (zero4 == 0);
+ }
+
+ /* Check construction from enum value. */
+ {
+ gdb_static_assert (test_flags (FLAG1) == FLAG1);
+ gdb_static_assert (test_flags (FLAG2) != FLAG1);
+ }
+
+ /* Check copy/assignment. */
+ {
+ constexpr test_flags src = FLAG1;
+
+ constexpr test_flags f1 = src;
+ constexpr test_flags f2 (src);
+ constexpr test_flags f3 {src};
+ constexpr test_flags f4 = {src};
+
+ gdb_static_assert (f1 == FLAG1);
+ gdb_static_assert (f2 == FLAG1);
+ gdb_static_assert (f3 == FLAG1);
+ gdb_static_assert (f4 == FLAG1);
+ }
+
+ /* Check moving. */
+ {
+ test_flags src = FLAG1;
+ test_flags dst = 0;
+
+ dst = std::move (src);
+ SELF_CHECK (dst == FLAG1);
+ }
+
+ /* Check construction from an 'or' of multiple bits. For this to
+ work, operator| must be overridden to return an enum type. The
+ builtin version would return int instead and then the conversion
+ to test_flags would fail. */
+ {
+ constexpr test_flags f = FLAG1 | FLAG2;
+ gdb_static_assert (f == (FLAG1 | FLAG2));
+ }
+
+ /* Similarly, check that "FLAG1 | FLAG2" on the rhs of an assignment
+ operator works. */
+ {
+ test_flags f = 0;
+ f |= FLAG1 | FLAG2;
+ SELF_CHECK (f == (FLAG1 | FLAG2));
+
+ f &= FLAG1 | FLAG2;
+ SELF_CHECK (f == (FLAG1 | FLAG2));
+
+ f ^= FLAG1 | FLAG2;
+ SELF_CHECK (f == 0);
+ }
+
+ /* Check explicit conversion to int works. */
+ {
+ constexpr int some_bits (FLAG1 | FLAG2);
+
+ /* And comparison with int works too. */
+ gdb_static_assert (some_bits == (FLAG1 | FLAG2));
+ gdb_static_assert (some_bits == test_flags (FLAG1 | FLAG2));
+ }
+
+ /* Check operator| and operator|=. Particularly interesting is
+ making sure that putting the enum value on the lhs side of the
+ expression works (FLAG | f). */
+ {
+ test_flags f = FLAG1;
+ f |= FLAG2;
+ SELF_CHECK (f == (FLAG1 | FLAG2));
+ }
+ {
+ test_flags f = FLAG1;
+ f = f | FLAG2;
+ SELF_CHECK (f == (FLAG1 | FLAG2));
+ }
+ {
+ test_flags f = FLAG1;
+ f = FLAG2 | f;
+ SELF_CHECK (f == (FLAG1 | FLAG2));
+ }
+
+ /* Check the &/&= operators. */
+ {
+ test_flags f = FLAG1 & FLAG2;
+ SELF_CHECK (f == 0);
+
+ f = FLAG1 | FLAG2;
+ f &= FLAG2;
+ SELF_CHECK (f == FLAG2);
+
+ f = FLAG1 | FLAG2;
+ f = f & FLAG2;
+ SELF_CHECK (f == FLAG2);
+
+ f = FLAG1 | FLAG2;
+ f = FLAG2 & f;
+ SELF_CHECK (f == FLAG2);
+ }
+
+ /* Check the ^/^= operators. */
+ {
+ constexpr test_flags f = FLAG1 ^ FLAG2;
+ gdb_static_assert (f == (FLAG1 ^ FLAG2));
+ }
+
+ {
+ test_flags f = FLAG1 ^ FLAG2;
+ f ^= FLAG3;
+ SELF_CHECK (f == (FLAG1 | FLAG2 | FLAG3));
+ f = f ^ FLAG3;
+ SELF_CHECK (f == (FLAG1 | FLAG2));
+ f = FLAG3 ^ f;
+ SELF_CHECK (f == (FLAG1 | FLAG2 | FLAG3));
+ }
+
+ /* Check operator~. Note this only compiles with unsigned
+ flags. */
+ {
+ constexpr test_uflags f1 = ~UFLAG1;
+ constexpr test_uflags f2 = ~f1;
+ gdb_static_assert (f2 == UFLAG1);
+ }
+
+ /* Check the ternary operator. */
+
+ {
+ /* raw enum, raw enum */
+ constexpr test_flags f1 = true ? FLAG1 : FLAG2;
+ gdb_static_assert (f1 == FLAG1);
+ constexpr test_flags f2 = false ? FLAG1 : FLAG2;
+ gdb_static_assert (f2 == FLAG2);
+ }
+
+ {
+ /* enum flags, raw enum */
+ constexpr test_flags src = FLAG1;
+ constexpr test_flags f1 = true ? src : FLAG2;
+ gdb_static_assert (f1 == FLAG1);
+ constexpr test_flags f2 = false ? src : FLAG2;
+ gdb_static_assert (f2 == FLAG2);
+ }
+
+ {
+ /* enum flags, enum flags */
+ constexpr test_flags src1 = FLAG1;
+ constexpr test_flags src2 = FLAG2;
+ constexpr test_flags f1 = true ? src1 : src2;
+ gdb_static_assert (f1 == src1);
+ constexpr test_flags f2 = false ? src1 : src2;
+ gdb_static_assert (f2 == src2);
+ }
+
+ /* Check that we can use flags in switch expressions (requires
+ unambiguous conversion to integer). Also check that we can use
+ operator| in switch cases, where only constants are allowed.
+ This should work because operator| is constexpr. */
+ {
+ test_flags f = FLAG1 | FLAG2;
+ bool ok = false;
+
+ switch (f)
+ {
+ case FLAG1:
+ break;
+ case FLAG2:
+ break;
+ case FLAG1 | FLAG2:
+ ok = true;
+ break;
+ }
+
+ SELF_CHECK (ok);
+ }
+}
+
+} /* namespace enum_flags_tests */
+} /* namespace selftests */
+
+void _initialize_enum_flags_selftests ();
+
+void
+_initialize_enum_flags_selftests ()
+{
+ selftests::register_test ("enum-flags",
+ selftests::enum_flags_tests::self_test);
+}
diff --git a/gdbsupport/enum-flags.h b/gdbsupport/enum-flags.h
index 825ff4faf2..d30d90b68d 100644
--- a/gdbsupport/enum-flags.h
+++ b/gdbsupport/enum-flags.h
@@ -18,6 +18,8 @@
#ifndef COMMON_ENUM_FLAGS_H
#define COMMON_ENUM_FLAGS_H
+#include "traits.h"
+
/* Type-safe wrapper for enum flags. enum flags are enums where the
values are bits that are meant to be ORed together.
@@ -51,23 +53,31 @@
#ifdef __cplusplus
-/* Traits type used to prevent the global operator overloads from
- instantiating for non-flag enums. */
-template<typename T> struct enum_flags_type {};
-
-/* Use this to mark an enum as flags enum. It defines FLAGS as
+/* Use this to mark an enum as flags enum. It defines FLAGS_TYPE as
enum_flags wrapper class for ENUM, and enables the global operator
overloads for ENUM. */
#define DEF_ENUM_FLAGS_TYPE(enum_type, flags_type) \
typedef enum_flags<enum_type> flags_type; \
- template<> \
- struct enum_flags_type<enum_type> \
- { \
- typedef enum_flags<enum_type> type; \
- }
+ void is_enum_flags_enum_type (enum_type *)
+
+/* To enable the global enum_flags operators for enum, declare an
+ "is_enum_flags_enum_type" overload that has exactly one parameter,
+ of type a pointer to that enum class. E.g.,:
+
+ void is_enum_flags_enum_type (enum some_flag *);
+
+ The function does not need to be defined, only declared.
+ DEF_ENUM_FLAGS_TYPE declares this.
+
+ A function declaration is preferred over a traits type, because the
+ former allows calling the DEF_ENUM_FLAGS_TYPE macro inside a
+ namespace to define the corresponding enum flags type in that
+ namespace. The compiler finds the corresponding
+ is_enum_flags_enum_type function via ADL. */
-/* Until we can rely on std::underlying type being universally
- available (C++11), roll our own for enums. */
+/* Note that std::underlying_type<enum_type> is not what we want here,
+ since that returns unsigned int even when the enum decays to signed
+ int. */
template<int size, bool sign> class integer_for_size { typedef void type; };
template<> struct integer_for_size<1, 0> { typedef uint8_t type; };
template<> struct integer_for_size<2, 0> { typedef uint16_t type; };
@@ -86,128 +96,324 @@ struct enum_underlying_type
type;
};
-template <typename E>
-class enum_flags
+namespace enum_flags_detail
{
-public:
- typedef E enum_type;
- typedef typename enum_underlying_type<enum_type>::type underlying_type;
-private:
- /* Private type used to support initializing flag types with zero:
+/* Private type used to support initializing flag types with zero:
- foo_flags f = 0;
+ foo_flags f = 0;
- but not other integers:
+ but not other integers:
- foo_flags f = 1;
+ foo_flags f = 1;
- The way this works is that we define an implicit constructor that
- takes a pointer to this private type. Since nothing can
- instantiate an object of this type, the only possible pointer to
- pass to the constructor is the NULL pointer, or, zero. */
- struct zero_type;
+ The way this works is that we define an implicit constructor that
+ takes a pointer to this private type. Since nothing can
+ instantiate an object of this type, the only possible pointer to
+ pass to the constructor is the NULL pointer, or, zero. */
+struct zero_type;
- underlying_type
- underlying_value () const
- {
- return m_enum_value;
- }
+/* gdb::Requires trait helpers. */
+template <typename enum_type>
+using EnumIsUnsigned
+ = std::is_unsigned<typename enum_underlying_type<enum_type>::type>;
+template <typename enum_type>
+using EnumIsSigned
+ = std::is_signed<typename enum_underlying_type<enum_type>::type>;
+
+}
+
+template <typename E>
+class enum_flags
+{
+public:
+ typedef E enum_type;
+ typedef typename enum_underlying_type<enum_type>::type underlying_type;
public:
/* Allow default construction. */
- enum_flags ()
+ constexpr enum_flags ()
: m_enum_value ((enum_type) 0)
{}
+ /* The default move/copy ctor/assignment do the right thing. */
+
/* If you get an error saying these two overloads are ambiguous,
then you tried to mix values of different enum types. */
- enum_flags (enum_type e)
+ constexpr enum_flags (enum_type e)
: m_enum_value (e)
{}
- enum_flags (struct enum_flags::zero_type *zero)
+ constexpr enum_flags (enum_flags_detail::zero_type *zero)
: m_enum_value ((enum_type) 0)
{}
- enum_flags &operator&= (enum_type e)
+ enum_flags &operator&= (enum_flags e) &
{
- m_enum_value = (enum_type) (underlying_value () & e);
+ m_enum_value = (enum_type) (m_enum_value & e.m_enum_value);
return *this;
}
- enum_flags &operator|= (enum_type e)
+ enum_flags &operator|= (enum_flags e) &
{
- m_enum_value = (enum_type) (underlying_value () | e);
+ m_enum_value = (enum_type) (m_enum_value | e.m_enum_value);
return *this;
}
- enum_flags &operator^= (enum_type e)
+ enum_flags &operator^= (enum_flags e) &
{
- m_enum_value = (enum_type) (underlying_value () ^ e);
+ m_enum_value = (enum_type) (m_enum_value ^ e.m_enum_value);
return *this;
}
- operator enum_type () const
+ /* Delete rval versions. */
+ void operator&= (enum_flags e) && = delete;
+ void operator|= (enum_flags e) && = delete;
+ void operator^= (enum_flags e) && = delete;
+
+ /* Like raw enums, allow conversion to the underlying type. */
+ constexpr operator underlying_type () const
{
return m_enum_value;
}
- enum_flags operator& (enum_type e) const
- {
- return (enum_type) (underlying_value () & e);
- }
- enum_flags operator| (enum_type e) const
- {
- return (enum_type) (underlying_value () | e);
- }
- enum_flags operator^ (enum_type e) const
- {
- return (enum_type) (underlying_value () ^ e);
- }
- enum_flags operator~ () const
+ /* Get the underlying value as a raw enum. */
+ constexpr enum_type raw () const
{
- // We only the underlying type to be unsigned when actually using
- // operator~ -- if it were not unsigned, undefined behavior could
- // result. However, asserting this in the class itself would
- // require too many unnecessary changes to otherwise ok enum
- // types.
- gdb_static_assert (std::is_unsigned<underlying_type>::value);
- return (enum_type) ~underlying_value ();
+ return m_enum_value;
}
+ /* Binary operations involving some unrelated type (which would be a
+ bug) are implemented as non-members, and deleted. */
+
private:
/* Stored as enum_type because GDB knows to print the bit flags
neatly if the enum values look like bit flags. */
enum_type m_enum_value;
};
+template <typename E>
+using is_enum_flags_enum_type_t
+ = decltype (is_enum_flags_enum_type (std::declval<E *> ()));
+
/* Global operator overloads. */
-template <typename enum_type>
-typename enum_flags_type<enum_type>::type
-operator& (enum_type e1, enum_type e2)
+/* Generate binary operators. */
+
+#define ENUM_FLAGS_GEN_BINOP(OPERATOR_OP, OP) \
+ \
+ /* Raw enum on both LHS/RHS. Returns raw enum type. */ \
+ template <typename enum_type, \
+ typename = is_enum_flags_enum_type_t<enum_type>> \
+ constexpr enum_type \
+ OPERATOR_OP (enum_type e1, enum_type e2) \
+ { \
+ using underlying = typename enum_flags<enum_type>::underlying_type; \
+ return (enum_type) (underlying (e1) OP underlying (e2)); \
+ } \
+ \
+ /* enum_flags on the LHS. */ \
+ template <typename enum_type, \
+ typename = is_enum_flags_enum_type_t<enum_type>> \
+ constexpr enum_flags<enum_type> \
+ OPERATOR_OP (enum_flags<enum_type> e1, enum_type e2) \
+ { return e1.raw () OP e2; } \
+ \
+ /* enum_flags on the RHS. */ \
+ template <typename enum_type, \
+ typename = is_enum_flags_enum_type_t<enum_type>> \
+ constexpr enum_flags<enum_type> \
+ OPERATOR_OP (enum_type e1, enum_flags<enum_type> e2) \
+ { return e1 OP e2.raw (); } \
+ \
+ /* enum_flags on both LHS/RHS. */ \
+ template <typename enum_type, \
+ typename = is_enum_flags_enum_type_t<enum_type>> \
+ constexpr enum_flags<enum_type> \
+ OPERATOR_OP (enum_flags<enum_type> e1, enum_flags<enum_type> e2) \
+ { return e1.raw () OP e2.raw (); } \
+ \
+ /* Delete cases involving unrelated types. */ \
+ \
+ template <typename enum_type, typename unrelated_type, \
+ typename = is_enum_flags_enum_type_t<enum_type>> \
+ constexpr enum_flags<enum_type> \
+ OPERATOR_OP (enum_type e1, unrelated_type e2) = delete; \
+ \
+ template <typename enum_type, typename unrelated_type, \
+ typename = is_enum_flags_enum_type_t<enum_type>> \
+ constexpr enum_flags<enum_type> \
+ OPERATOR_OP (unrelated_type e1, enum_type e2) = delete; \
+ \
+ template <typename enum_type, typename unrelated_type, \
+ typename = is_enum_flags_enum_type_t<enum_type>> \
+ constexpr enum_flags<enum_type> \
+ OPERATOR_OP (enum_flags<enum_type> e1, unrelated_type e2) = delete; \
+ \
+ template <typename enum_type, typename unrelated_type, \
+ typename = is_enum_flags_enum_type_t<enum_type>> \
+ constexpr enum_flags<enum_type> \
+ OPERATOR_OP (unrelated_type e1, enum_flags<enum_type> e2) = delete;
+
+/* Generate non-member compound assignment operators. Only the raw
+ enum versions are defined here. The enum_flags versions are
+ defined as member functions, simply because it's less code that
+ way.
+
+ Note we delete operators that would allow e.g.,
+
+ "enum_type | 1" or "enum_type1 | enum_type2"
+
+ because that would allow a mistake like :
+ enum flags1 { F1_FLAGS1 = 1 };
+ enum flags2 { F2_FLAGS2 = 2 };
+ enum flags1 val;
+ switch (val) {
+ case F1_FLAGS1 | F2_FLAGS2:
+ ...
+
+ If you really need to 'or' enumerators of different flag types,
+ cast to integer first.
+*/
+#define ENUM_FLAGS_GEN_COMPOUND_ASSIGN(OPERATOR_OP, OP) \
+ /* lval reference version. */ \
+ template <typename enum_type, \
+ typename = is_enum_flags_enum_type_t<enum_type>> \
+ constexpr enum_type & \
+ OPERATOR_OP (enum_type &e1, enum_type e2) \
+ { return e1 = e1 OP e2; } \
+ \
+ /* rval reference version. */ \
+ template <typename enum_type, \
+ typename = is_enum_flags_enum_type_t<enum_type>> \
+ void \
+ OPERATOR_OP (enum_type &&e1, enum_type e2) = delete; \
+ \
+ /* Delete compound assignment from unrelated types. */ \
+ \
+ template <typename enum_type, typename other_enum_type, \
+ typename = is_enum_flags_enum_type_t<enum_type>> \
+ constexpr enum_type & \
+ OPERATOR_OP (enum_type &e1, other_enum_type e2) = delete; \
+ \
+ template <typename enum_type, typename other_enum_type, \
+ typename = is_enum_flags_enum_type_t<enum_type>> \
+ void \
+ OPERATOR_OP (enum_type &&e1, other_enum_type e2) = delete;
+
+ENUM_FLAGS_GEN_BINOP (operator|, |)
+ENUM_FLAGS_GEN_BINOP (operator&, &)
+ENUM_FLAGS_GEN_BINOP (operator^, ^)
+
+ENUM_FLAGS_GEN_COMPOUND_ASSIGN (operator|=, |)
+ENUM_FLAGS_GEN_COMPOUND_ASSIGN (operator&=, &)
+ENUM_FLAGS_GEN_COMPOUND_ASSIGN (operator^=, ^)
+
+/* Allow comparison with enum_flags, raw enum, and integers, only.
+ The latter case allows "== 0". As side effect, it allows comparing
+ with integer variables too, but that's not a common mistake to
+ make. It's important to disable comparison with unrelated types to
+ prevent accidentally comparing with unrelated enum values, which
+ are convertible to integer, and thus coupled with enum_flags
+ convertion to underlying type too, would trigger the built-in 'bool
+ operator==(unsigned, int)' operator. */
+
+#define ENUM_FLAGS_GEN_COMP(OPERATOR_OP, OP) \
+ \
+ /* enum_flags OP enum_flags */ \
+ \
+ template <typename enum_type> \
+ constexpr bool \
+ OPERATOR_OP (enum_flags<enum_type> lhs, enum_flags<enum_type> rhs) \
+ { return lhs.raw () OP rhs.raw (); } \
+ \
+ /* enum_flags OP other */ \
+ \
+ template <typename enum_type> \
+ constexpr bool \
+ OPERATOR_OP (enum_flags<enum_type> lhs, enum_type rhs) \
+ { return lhs.raw () OP rhs; } \
+ \
+ template <typename enum_type> \
+ constexpr bool \
+ OPERATOR_OP (enum_flags<enum_type> lhs, int rhs) \
+ { return lhs.raw () OP rhs; } \
+ \
+ template <typename enum_type, typename U> \
+ constexpr bool \
+ OPERATOR_OP (enum_flags<enum_type> lhs, U rhs) = delete; \
+ \
+ /* other OP enum_flags */ \
+ \
+ template <typename enum_type> \
+ constexpr bool \
+ OPERATOR_OP (enum_type lhs, enum_flags<enum_type> rhs) \
+ { return lhs OP rhs.raw (); } \
+ \
+ template <typename enum_type> \
+ constexpr bool \
+ OPERATOR_OP (int lhs, enum_flags<enum_type> rhs) \
+ { return lhs OP rhs.raw (); } \
+ \
+ template <typename enum_type, typename U> \
+ constexpr bool \
+ OPERATOR_OP (U lhs, enum_flags<enum_type> rhs) = delete;
+
+ENUM_FLAGS_GEN_COMP (operator==, ==)
+ENUM_FLAGS_GEN_COMP (operator!=, !=)
+
+/* Unary operators for the raw flags enum. */
+
+/* We require underlying type to be unsigned when using operator~ --
+ if it were not unsigned, undefined behavior could result. However,
+ asserting this in the class itself would require too many
+ unnecessary changes to usages of otherwise OK enum types. */
+template <typename enum_type,
+ typename = is_enum_flags_enum_type_t<enum_type>,
+ typename
+ = gdb::Requires<enum_flags_detail::EnumIsUnsigned<enum_type>>>
+constexpr enum_type
+operator~ (enum_type e)
{
- return enum_flags<enum_type> (e1) & e2;
+ using underlying = typename enum_flags<enum_type>::underlying_type;
+ return (enum_type) ~underlying (e);
}
-template <typename enum_type>
-typename enum_flags_type<enum_type>::type
-operator| (enum_type e1, enum_type e2)
+template <typename enum_type,
+ typename = is_enum_flags_enum_type_t<enum_type>,
+ typename = gdb::Requires<enum_flags_detail::EnumIsSigned<enum_type>>>
+constexpr void operator~ (enum_type e) = delete;
+
+template <typename enum_type,
+ typename = is_enum_flags_enum_type_t<enum_type>,
+ typename
+ = gdb::Requires<enum_flags_detail::EnumIsUnsigned<enum_type>>>
+constexpr enum_flags<enum_type>
+operator~ (enum_flags<enum_type> e)
{
- return enum_flags<enum_type> (e1) | e2;
+ using underlying = typename enum_flags<enum_type>::underlying_type;
+ return (enum_type) ~underlying (e);
}
-template <typename enum_type>
-typename enum_flags_type<enum_type>::type
-operator^ (enum_type e1, enum_type e2)
-{
- return enum_flags<enum_type> (e1) ^ e2;
-}
+template <typename enum_type,
+ typename = is_enum_flags_enum_type_t<enum_type>,
+ typename = gdb::Requires<enum_flags_detail::EnumIsSigned<enum_type>>>
+constexpr void operator~ (enum_flags<enum_type> e) = delete;
-template <typename enum_type>
-typename enum_flags_type<enum_type>::type
-operator~ (enum_type e)
-{
- return ~enum_flags<enum_type> (e);
-}
+/* Delete operator<< and operator>>. */
+
+template <typename enum_type, typename any_type,
+ typename = is_enum_flags_enum_type_t<enum_type>>
+void operator<< (const enum_type &, const any_type &) = delete;
+
+template <typename enum_type, typename any_type,
+ typename = is_enum_flags_enum_type_t<enum_type>>
+void operator<< (const enum_flags<enum_type> &, const any_type &) = delete;
+
+template <typename enum_type, typename any_type,
+ typename = is_enum_flags_enum_type_t<enum_type>>
+void operator>> (const enum_type &, const any_type &) = delete;
+
+template <typename enum_type, typename any_type,
+ typename = is_enum_flags_enum_type_t<enum_type>>
+void operator>> (const enum_flags<enum_type> &, const any_type &) = delete;
#else /* __cplusplus */
diff --git a/gdbsupport/valid-expr.h b/gdbsupport/valid-expr.h
index a22fa61134..459de17926 100644
--- a/gdbsupport/valid-expr.h
+++ b/gdbsupport/valid-expr.h
@@ -91,4 +91,19 @@
ESC_PARENS (T1, T2, T3, T4), \
VALID, EXPR_TYPE, EXPR)
+#define CHECK_VALID_EXPR_5(T1, T2, T3, T4, T5, VALID, EXPR_TYPE, EXPR) \
+ CHECK_VALID_EXPR_INT (ESC_PARENS (typename T1, typename T2, \
+ typename T3, typename T4, \
+ typename T5), \
+ ESC_PARENS (T1, T2, T3, T4, T5), \
+ VALID, EXPR_TYPE, EXPR)
+
+#define CHECK_VALID_EXPR_6(T1, T2, T3, T4, T5, T6, \
+ VALID, EXPR_TYPE, EXPR) \
+ CHECK_VALID_EXPR_INT (ESC_PARENS (typename T1, typename T2, \
+ typename T3, typename T4, \
+ typename T5, typename T6), \
+ ESC_PARENS (T1, T2, T3, T4, T5, T6), \
+ VALID, EXPR_TYPE, EXPR)
+
#endif /* COMMON_VALID_EXPR_H */
--
2.14.5
^ permalink raw reply [flat|nested] 14+ messages in thread
* [pushed] gdb: remove TYPE_INSTANCE_FLAGS
2020-09-14 21:31 ` [pushed v2 1/4] Use type_instance_flags more throughout Pedro Alves
@ 2020-09-15 2:28 ` Simon Marchi
2020-09-15 21:28 ` Luis Machado
0 siblings, 1 reply; 14+ messages in thread
From: Simon Marchi @ 2020-09-15 2:28 UTC (permalink / raw)
To: Pedro Alves, gdb-patches
On 2020-09-14 5:31 p.m., Pedro Alves wrote:
> A later patch in this series will rewrite enum_flags fixing some API
> holes. That would cause build failures around code using
> type_instance_flags. Or rather, that should be using it, but wasn't.
>
> This patch fixes it by using type_instance_flags throughout instead of
> plain integers.
>
> Note that we can't make the seemingly obvious change to struct
> type::instance_flags:
>
> - unsigned instance_flags : 9;
> + ENUM_BITFIELD (type_instance_flag_value) instance_flags : 9;
>
> Because G++ complains then that 9 bits isn't sufficient for holding
> all values of type_instance_flag_value.
>
> So the patch adds an type::instance_flags() method, which takes care
> of casting appropriately, and adds a separate type::set_instance_flags
> method, following the pattern of the ongoing TYPE_XXX macro
> elimination. This converts uses of TYPE_INSTANCE_FLAGS to
> type::instance_flags() in the places where the code was already being
> touched, but there are still many references to the
> TYPE_INSTANCE_FLAGS macro left behind. Those could/should be fully
> replaced at some point.
Oh, thanks for doing this. I just pushed this to eliminate TYPE_INSTANCE_FLAGS.
From 10242f367fe102a4d55574c930ebfb389dbd233d Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@efficios.com>
Date: Mon, 14 Sep 2020 22:22:33 -0400
Subject: [PATCH] gdb: remove TYPE_INSTANCE_FLAGS
Remove it, use the `type::instance_flags` method everywhere.
gdb/ChangeLog:
* gdbtypes.h (TYPE_INSTANCE_FLAGS): Remove, replace all uses
with `type::instance_flags`.
Change-Id: I3653108b712e6186529cb0102e2b70247bbcabbe
---
gdb/ChangeLog | 5 +++++
gdb/c-typeprint.c | 2 +-
gdb/compile/compile-c-types.c | 6 +++---
gdb/compile/compile-cplus-types.c | 6 +++---
gdb/gdbtypes.c | 21 +++++++++------------
gdb/gdbtypes.h | 21 ++++++++++-----------
gdb/stabsread.c | 9 ++++-----
7 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0e6dec38b2ae..a68c1ab248a7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2020-09-14 Simon Marchi <simon.marchi@efficios.com>
+
+ * gdbtypes.h (TYPE_INSTANCE_FLAGS): Remove, replace all uses
+ with `type::instance_flags`.
+
2020-09-14 Michael Mullin <masmullin@gmail.com>
* xml-tdesc.c [!defined(HAVE_LIBEXPAT)] (tdesc_parse_xml):
diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index a07b29a95de8..d89c420add6b 100644
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -528,7 +528,7 @@ c_type_print_modifier (struct type *type, struct ui_file *stream,
address_space_id
= address_space_type_instance_flags_to_name (get_type_arch (type),
- TYPE_INSTANCE_FLAGS (type));
+ type->instance_flags ());
if (address_space_id)
{
if (did_print_modifier || need_pre_space)
diff --git a/gdb/compile/compile-c-types.c b/gdb/compile/compile-c-types.c
index 6c9135947eac..585f6c89435b 100644
--- a/gdb/compile/compile-c-types.c
+++ b/gdb/compile/compile-c-types.c
@@ -278,9 +278,9 @@ convert_type_basic (compile_c_instance *context, struct type *type)
{
/* If we are converting a qualified type, first convert the
unqualified type and then apply the qualifiers. */
- if ((TYPE_INSTANCE_FLAGS (type) & (TYPE_INSTANCE_FLAG_CONST
- | TYPE_INSTANCE_FLAG_VOLATILE
- | TYPE_INSTANCE_FLAG_RESTRICT)) != 0)
+ if ((type->instance_flags () & (TYPE_INSTANCE_FLAG_CONST
+ | TYPE_INSTANCE_FLAG_VOLATILE
+ | TYPE_INSTANCE_FLAG_RESTRICT)) != 0)
return convert_qualified (context, type);
switch (type->code ())
diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-types.c
index 2d4352f6c2c4..a0945683e474 100644
--- a/gdb/compile/compile-cplus-types.c
+++ b/gdb/compile/compile-cplus-types.c
@@ -1135,9 +1135,9 @@ convert_type_cplus_basic (compile_cplus_instance *instance,
{
/* If we are converting a qualified type, first convert the
unqualified type and then apply the qualifiers. */
- if ((TYPE_INSTANCE_FLAGS (type) & (TYPE_INSTANCE_FLAG_CONST
- | TYPE_INSTANCE_FLAG_VOLATILE
- | TYPE_INSTANCE_FLAG_RESTRICT)) != 0)
+ if ((type->instance_flags () & (TYPE_INSTANCE_FLAG_CONST
+ | TYPE_INSTANCE_FLAG_VOLATILE
+ | TYPE_INSTANCE_FLAG_RESTRICT)) != 0)
return compile_cplus_convert_qualified (instance, type);
switch (type->code ())
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 7ade2ccb533b..f1f4ec52c7bb 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -630,7 +630,7 @@ make_qualified_type (struct type *type, type_instance_flags new_flags,
ntype = type;
do
{
- if (TYPE_INSTANCE_FLAGS (ntype) == new_flags)
+ if (ntype->instance_flags () == new_flags)
return ntype;
ntype = TYPE_CHAIN (ntype);
}
@@ -753,7 +753,7 @@ struct type *
make_restrict_type (struct type *type)
{
return make_qualified_type (type,
- (TYPE_INSTANCE_FLAGS (type)
+ (type->instance_flags ()
| TYPE_INSTANCE_FLAG_RESTRICT),
NULL);
}
@@ -764,7 +764,7 @@ struct type *
make_unqualified_type (struct type *type)
{
return make_qualified_type (type,
- (TYPE_INSTANCE_FLAGS (type)
+ (type->instance_flags ()
& ~(TYPE_INSTANCE_FLAG_CONST
| TYPE_INSTANCE_FLAG_VOLATILE
| TYPE_INSTANCE_FLAG_RESTRICT)),
@@ -777,7 +777,7 @@ struct type *
make_atomic_type (struct type *type)
{
return make_qualified_type (type,
- (TYPE_INSTANCE_FLAGS (type)
+ (type->instance_flags ()
| TYPE_INSTANCE_FLAG_ATOMIC),
NULL);
}
@@ -825,7 +825,7 @@ replace_type (struct type *ntype, struct type *type)
/* Assert that the two types have equivalent instance qualifiers.
This should be true for at least all of our debug readers. */
- gdb_assert (TYPE_INSTANCE_FLAGS (ntype) == TYPE_INSTANCE_FLAGS (type));
+ gdb_assert (ntype->instance_flags () == type->instance_flags ());
}
/* Implement direct support for MEMBER_TYPE in GNU C++.
@@ -2834,9 +2834,7 @@ check_typedef (struct type *type)
move over any other types NEWTYPE refers to, which could
be an unbounded amount of stuff. */
if (TYPE_OBJFILE (newtype) == TYPE_OBJFILE (type))
- type = make_qualified_type (newtype,
- TYPE_INSTANCE_FLAGS (type),
- type);
+ type = make_qualified_type (newtype, type->instance_flags (), type);
else
type = newtype;
}
@@ -2862,9 +2860,8 @@ check_typedef (struct type *type)
with the complete type only if they are in the same
objfile. */
if (TYPE_OBJFILE (SYMBOL_TYPE (sym)) == TYPE_OBJFILE (type))
- type = make_qualified_type (SYMBOL_TYPE (sym),
- TYPE_INSTANCE_FLAGS (type),
- type);
+ type = make_qualified_type (SYMBOL_TYPE (sym),
+ type->instance_flags (), type);
else
type = SYMBOL_TYPE (sym);
}
@@ -4001,7 +3998,7 @@ check_types_equal (struct type *type1, struct type *type2,
|| type1->has_varargs () != type2->has_varargs ()
|| type1->is_vector () != type2->is_vector ()
|| TYPE_NOTTEXT (type1) != TYPE_NOTTEXT (type2)
- || TYPE_INSTANCE_FLAGS (type1) != TYPE_INSTANCE_FLAGS (type2)
+ || type1->instance_flags () != type2->instance_flags ()
|| type1->num_fields () != type2->num_fields ())
return false;
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 6b87de307bde..d28622d46cea 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -213,7 +213,7 @@ DEF_ENUM_FLAGS_TYPE (enum type_instance_flag_value, type_instance_flags);
/* * Not textual. By default, GDB treats all single byte integers as
characters (or elements of strings) unless this flag is set. */
-#define TYPE_NOTTEXT(t) (TYPE_INSTANCE_FLAGS (t) & TYPE_INSTANCE_FLAG_NOTTEXT)
+#define TYPE_NOTTEXT(t) (((t)->instance_flags ()) & TYPE_INSTANCE_FLAG_NOTTEXT)
/* * Type owner. If TYPE_OBJFILE_OWNED is true, the type is owned by
the objfile retrieved as TYPE_OBJFILE. Otherwise, the type is
@@ -240,25 +240,25 @@ DEF_ENUM_FLAGS_TYPE (enum type_instance_flag_value, type_instance_flags);
/* * Constant type. If this is set, the corresponding type has a
const modifier. */
-#define TYPE_CONST(t) ((TYPE_INSTANCE_FLAGS (t) & TYPE_INSTANCE_FLAG_CONST) != 0)
+#define TYPE_CONST(t) ((((t)->instance_flags ()) & TYPE_INSTANCE_FLAG_CONST) != 0)
/* * Volatile type. If this is set, the corresponding type has a
volatile modifier. */
#define TYPE_VOLATILE(t) \
- ((TYPE_INSTANCE_FLAGS (t) & TYPE_INSTANCE_FLAG_VOLATILE) != 0)
+ ((((t)->instance_flags ()) & TYPE_INSTANCE_FLAG_VOLATILE) != 0)
/* * Restrict type. If this is set, the corresponding type has a
restrict modifier. */
#define TYPE_RESTRICT(t) \
- ((TYPE_INSTANCE_FLAGS (t) & TYPE_INSTANCE_FLAG_RESTRICT) != 0)
+ ((((t)->instance_flags ()) & TYPE_INSTANCE_FLAG_RESTRICT) != 0)
/* * Atomic type. If this is set, the corresponding type has an
_Atomic modifier. */
#define TYPE_ATOMIC(t) \
- ((TYPE_INSTANCE_FLAGS (t) & TYPE_INSTANCE_FLAG_ATOMIC) != 0)
+ ((((t)->instance_flags ()) & TYPE_INSTANCE_FLAG_ATOMIC) != 0)
/* * True if this type represents either an lvalue or lvalue reference type. */
@@ -297,10 +297,10 @@ DEF_ENUM_FLAGS_TYPE (enum type_instance_flag_value, type_instance_flags);
is instruction space, and for data objects is data memory. */
#define TYPE_CODE_SPACE(t) \
- ((TYPE_INSTANCE_FLAGS (t) & TYPE_INSTANCE_FLAG_CODE_SPACE) != 0)
+ ((((t)->instance_flags ()) & TYPE_INSTANCE_FLAG_CODE_SPACE) != 0)
#define TYPE_DATA_SPACE(t) \
- ((TYPE_INSTANCE_FLAGS (t) & TYPE_INSTANCE_FLAG_DATA_SPACE) != 0)
+ ((((t)->instance_flags ()) & TYPE_INSTANCE_FLAG_DATA_SPACE) != 0)
/* * Address class flags. Some environments provide for pointers
whose size is different from that of a normal pointer or address
@@ -309,13 +309,13 @@ DEF_ENUM_FLAGS_TYPE (enum type_instance_flag_value, type_instance_flags);
target specific ways to represent these different types of address
classes. */
-#define TYPE_ADDRESS_CLASS_1(t) (TYPE_INSTANCE_FLAGS(t) \
+#define TYPE_ADDRESS_CLASS_1(t) (((t)->instance_flags ()) \
& TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1)
-#define TYPE_ADDRESS_CLASS_2(t) (TYPE_INSTANCE_FLAGS(t) \
+#define TYPE_ADDRESS_CLASS_2(t) (((t)->instance_flags ()) \
& TYPE_INSTANCE_FLAG_ADDRESS_CLASS_2)
#define TYPE_INSTANCE_FLAG_ADDRESS_CLASS_ALL \
(TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1 | TYPE_INSTANCE_FLAG_ADDRESS_CLASS_2)
-#define TYPE_ADDRESS_CLASS_ALL(t) (TYPE_INSTANCE_FLAGS(t) \
+#define TYPE_ADDRESS_CLASS_ALL(t) (((t)->instance_flags ()) \
& TYPE_INSTANCE_FLAG_ADDRESS_CLASS_ALL)
/* * Information about a single discriminant. */
@@ -1684,7 +1684,6 @@ extern void allocate_gnat_aux_type (struct type *);
TYPE_ZALLOC (type, \
sizeof (*TYPE_MAIN_TYPE (type)->type_specific.func_stuff)))
-#define TYPE_INSTANCE_FLAGS(thistype) ((thistype)->instance_flags ())
#define TYPE_MAIN_TYPE(thistype) (thistype)->main_type
#define TYPE_TARGET_TYPE(thistype) TYPE_MAIN_TYPE(thistype)->target_type
#define TYPE_POINTER_TYPE(thistype) (thistype)->pointer_type
diff --git a/gdb/stabsread.c b/gdb/stabsread.c
index 02fc8ccfd2b4..4b1e3b2857aa 100644
--- a/gdb/stabsread.c
+++ b/gdb/stabsread.c
@@ -4473,12 +4473,11 @@ cleanup_undefined_types_1 (void)
if (SYMBOL_CLASS (sym) == LOC_TYPEDEF
&& SYMBOL_DOMAIN (sym) == STRUCT_DOMAIN
- && (SYMBOL_TYPE (sym)->code () ==
- (*type)->code ())
- && (TYPE_INSTANCE_FLAGS (*type) ==
- TYPE_INSTANCE_FLAGS (SYMBOL_TYPE (sym)))
+ && (SYMBOL_TYPE (sym)->code () == (*type)->code ())
+ && ((*type)->instance_flags ()
+ == SYMBOL_TYPE (sym)->instance_flags ())
&& strcmp (sym->linkage_name (), type_name) == 0)
- replace_type (*type, SYMBOL_TYPE (sym));
+ replace_type (*type, SYMBOL_TYPE (sym));
}
}
}
--
2.28.0
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [pushed] gdb: remove TYPE_INSTANCE_FLAGS
2020-09-15 2:28 ` [pushed] gdb: remove TYPE_INSTANCE_FLAGS Simon Marchi
@ 2020-09-15 21:28 ` Luis Machado
2020-09-16 2:50 ` Simon Marchi
0 siblings, 1 reply; 14+ messages in thread
From: Luis Machado @ 2020-09-15 21:28 UTC (permalink / raw)
To: Simon Marchi, Pedro Alves, gdb-patches
I think you missed adjusting the stale references in gdb/gdb-gdb.py.in.
On 9/14/20 11:28 PM, Simon Marchi wrote:
> On 2020-09-14 5:31 p.m., Pedro Alves wrote:
>> A later patch in this series will rewrite enum_flags fixing some API
>> holes. That would cause build failures around code using
>> type_instance_flags. Or rather, that should be using it, but wasn't.
>>
>> This patch fixes it by using type_instance_flags throughout instead of
>> plain integers.
>>
>> Note that we can't make the seemingly obvious change to struct
>> type::instance_flags:
>>
>> - unsigned instance_flags : 9;
>> + ENUM_BITFIELD (type_instance_flag_value) instance_flags : 9;
>>
>> Because G++ complains then that 9 bits isn't sufficient for holding
>> all values of type_instance_flag_value.
>>
>> So the patch adds an type::instance_flags() method, which takes care
>> of casting appropriately, and adds a separate type::set_instance_flags
>> method, following the pattern of the ongoing TYPE_XXX macro
>> elimination. This converts uses of TYPE_INSTANCE_FLAGS to
>> type::instance_flags() in the places where the code was already being
>> touched, but there are still many references to the
>> TYPE_INSTANCE_FLAGS macro left behind. Those could/should be fully
>> replaced at some point.
>
> Oh, thanks for doing this. I just pushed this to eliminate TYPE_INSTANCE_FLAGS.
>
>From 10242f367fe102a4d55574c930ebfb389dbd233d Mon Sep 17 00:00:00 2001
> From: Simon Marchi <simon.marchi@efficios.com>
> Date: Mon, 14 Sep 2020 22:22:33 -0400
> Subject: [PATCH] gdb: remove TYPE_INSTANCE_FLAGS
>
> Remove it, use the `type::instance_flags` method everywhere.
>
> gdb/ChangeLog:
>
> * gdbtypes.h (TYPE_INSTANCE_FLAGS): Remove, replace all uses
> with `type::instance_flags`.
>
> Change-Id: I3653108b712e6186529cb0102e2b70247bbcabbe
> ---
> gdb/ChangeLog | 5 +++++
> gdb/c-typeprint.c | 2 +-
> gdb/compile/compile-c-types.c | 6 +++---
> gdb/compile/compile-cplus-types.c | 6 +++---
> gdb/gdbtypes.c | 21 +++++++++------------
> gdb/gdbtypes.h | 21 ++++++++++-----------
> gdb/stabsread.c | 9 ++++-----
> 7 files changed, 35 insertions(+), 35 deletions(-)
>
> diff --git a/gdb/ChangeLog b/gdb/ChangeLog
> index 0e6dec38b2ae..a68c1ab248a7 100644
> --- a/gdb/ChangeLog
> +++ b/gdb/ChangeLog
> @@ -1,3 +1,8 @@
> +2020-09-14 Simon Marchi <simon.marchi@efficios.com>
> +
> + * gdbtypes.h (TYPE_INSTANCE_FLAGS): Remove, replace all uses
> + with `type::instance_flags`.
> +
> 2020-09-14 Michael Mullin <masmullin@gmail.com>
>
> * xml-tdesc.c [!defined(HAVE_LIBEXPAT)] (tdesc_parse_xml):
> diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
> index a07b29a95de8..d89c420add6b 100644
> --- a/gdb/c-typeprint.c
> +++ b/gdb/c-typeprint.c
> @@ -528,7 +528,7 @@ c_type_print_modifier (struct type *type, struct ui_file *stream,
>
> address_space_id
> = address_space_type_instance_flags_to_name (get_type_arch (type),
> - TYPE_INSTANCE_FLAGS (type));
> + type->instance_flags ());
> if (address_space_id)
> {
> if (did_print_modifier || need_pre_space)
> diff --git a/gdb/compile/compile-c-types.c b/gdb/compile/compile-c-types.c
> index 6c9135947eac..585f6c89435b 100644
> --- a/gdb/compile/compile-c-types.c
> +++ b/gdb/compile/compile-c-types.c
> @@ -278,9 +278,9 @@ convert_type_basic (compile_c_instance *context, struct type *type)
> {
> /* If we are converting a qualified type, first convert the
> unqualified type and then apply the qualifiers. */
> - if ((TYPE_INSTANCE_FLAGS (type) & (TYPE_INSTANCE_FLAG_CONST
> - | TYPE_INSTANCE_FLAG_VOLATILE
> - | TYPE_INSTANCE_FLAG_RESTRICT)) != 0)
> + if ((type->instance_flags () & (TYPE_INSTANCE_FLAG_CONST
> + | TYPE_INSTANCE_FLAG_VOLATILE
> + | TYPE_INSTANCE_FLAG_RESTRICT)) != 0)
> return convert_qualified (context, type);
>
> switch (type->code ())
> diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-types.c
> index 2d4352f6c2c4..a0945683e474 100644
> --- a/gdb/compile/compile-cplus-types.c
> +++ b/gdb/compile/compile-cplus-types.c
> @@ -1135,9 +1135,9 @@ convert_type_cplus_basic (compile_cplus_instance *instance,
> {
> /* If we are converting a qualified type, first convert the
> unqualified type and then apply the qualifiers. */
> - if ((TYPE_INSTANCE_FLAGS (type) & (TYPE_INSTANCE_FLAG_CONST
> - | TYPE_INSTANCE_FLAG_VOLATILE
> - | TYPE_INSTANCE_FLAG_RESTRICT)) != 0)
> + if ((type->instance_flags () & (TYPE_INSTANCE_FLAG_CONST
> + | TYPE_INSTANCE_FLAG_VOLATILE
> + | TYPE_INSTANCE_FLAG_RESTRICT)) != 0)
> return compile_cplus_convert_qualified (instance, type);
>
> switch (type->code ())
> diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
> index 7ade2ccb533b..f1f4ec52c7bb 100644
> --- a/gdb/gdbtypes.c
> +++ b/gdb/gdbtypes.c
> @@ -630,7 +630,7 @@ make_qualified_type (struct type *type, type_instance_flags new_flags,
> ntype = type;
> do
> {
> - if (TYPE_INSTANCE_FLAGS (ntype) == new_flags)
> + if (ntype->instance_flags () == new_flags)
> return ntype;
> ntype = TYPE_CHAIN (ntype);
> }
> @@ -753,7 +753,7 @@ struct type *
> make_restrict_type (struct type *type)
> {
> return make_qualified_type (type,
> - (TYPE_INSTANCE_FLAGS (type)
> + (type->instance_flags ()
> | TYPE_INSTANCE_FLAG_RESTRICT),
> NULL);
> }
> @@ -764,7 +764,7 @@ struct type *
> make_unqualified_type (struct type *type)
> {
> return make_qualified_type (type,
> - (TYPE_INSTANCE_FLAGS (type)
> + (type->instance_flags ()
> & ~(TYPE_INSTANCE_FLAG_CONST
> | TYPE_INSTANCE_FLAG_VOLATILE
> | TYPE_INSTANCE_FLAG_RESTRICT)),
> @@ -777,7 +777,7 @@ struct type *
> make_atomic_type (struct type *type)
> {
> return make_qualified_type (type,
> - (TYPE_INSTANCE_FLAGS (type)
> + (type->instance_flags ()
> | TYPE_INSTANCE_FLAG_ATOMIC),
> NULL);
> }
> @@ -825,7 +825,7 @@ replace_type (struct type *ntype, struct type *type)
>
> /* Assert that the two types have equivalent instance qualifiers.
> This should be true for at least all of our debug readers. */
> - gdb_assert (TYPE_INSTANCE_FLAGS (ntype) == TYPE_INSTANCE_FLAGS (type));
> + gdb_assert (ntype->instance_flags () == type->instance_flags ());
> }
>
> /* Implement direct support for MEMBER_TYPE in GNU C++.
> @@ -2834,9 +2834,7 @@ check_typedef (struct type *type)
> move over any other types NEWTYPE refers to, which could
> be an unbounded amount of stuff. */
> if (TYPE_OBJFILE (newtype) == TYPE_OBJFILE (type))
> - type = make_qualified_type (newtype,
> - TYPE_INSTANCE_FLAGS (type),
> - type);
> + type = make_qualified_type (newtype, type->instance_flags (), type);
> else
> type = newtype;
> }
> @@ -2862,9 +2860,8 @@ check_typedef (struct type *type)
> with the complete type only if they are in the same
> objfile. */
> if (TYPE_OBJFILE (SYMBOL_TYPE (sym)) == TYPE_OBJFILE (type))
> - type = make_qualified_type (SYMBOL_TYPE (sym),
> - TYPE_INSTANCE_FLAGS (type),
> - type);
> + type = make_qualified_type (SYMBOL_TYPE (sym),
> + type->instance_flags (), type);
> else
> type = SYMBOL_TYPE (sym);
> }
> @@ -4001,7 +3998,7 @@ check_types_equal (struct type *type1, struct type *type2,
> || type1->has_varargs () != type2->has_varargs ()
> || type1->is_vector () != type2->is_vector ()
> || TYPE_NOTTEXT (type1) != TYPE_NOTTEXT (type2)
> - || TYPE_INSTANCE_FLAGS (type1) != TYPE_INSTANCE_FLAGS (type2)
> + || type1->instance_flags () != type2->instance_flags ()
> || type1->num_fields () != type2->num_fields ())
> return false;
>
> diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
> index 6b87de307bde..d28622d46cea 100644
> --- a/gdb/gdbtypes.h
> +++ b/gdb/gdbtypes.h
> @@ -213,7 +213,7 @@ DEF_ENUM_FLAGS_TYPE (enum type_instance_flag_value, type_instance_flags);
> /* * Not textual. By default, GDB treats all single byte integers as
> characters (or elements of strings) unless this flag is set. */
>
> -#define TYPE_NOTTEXT(t) (TYPE_INSTANCE_FLAGS (t) & TYPE_INSTANCE_FLAG_NOTTEXT)
> +#define TYPE_NOTTEXT(t) (((t)->instance_flags ()) & TYPE_INSTANCE_FLAG_NOTTEXT)
>
> /* * Type owner. If TYPE_OBJFILE_OWNED is true, the type is owned by
> the objfile retrieved as TYPE_OBJFILE. Otherwise, the type is
> @@ -240,25 +240,25 @@ DEF_ENUM_FLAGS_TYPE (enum type_instance_flag_value, type_instance_flags);
> /* * Constant type. If this is set, the corresponding type has a
> const modifier. */
>
> -#define TYPE_CONST(t) ((TYPE_INSTANCE_FLAGS (t) & TYPE_INSTANCE_FLAG_CONST) != 0)
> +#define TYPE_CONST(t) ((((t)->instance_flags ()) & TYPE_INSTANCE_FLAG_CONST) != 0)
>
> /* * Volatile type. If this is set, the corresponding type has a
> volatile modifier. */
>
> #define TYPE_VOLATILE(t) \
> - ((TYPE_INSTANCE_FLAGS (t) & TYPE_INSTANCE_FLAG_VOLATILE) != 0)
> + ((((t)->instance_flags ()) & TYPE_INSTANCE_FLAG_VOLATILE) != 0)
>
> /* * Restrict type. If this is set, the corresponding type has a
> restrict modifier. */
>
> #define TYPE_RESTRICT(t) \
> - ((TYPE_INSTANCE_FLAGS (t) & TYPE_INSTANCE_FLAG_RESTRICT) != 0)
> + ((((t)->instance_flags ()) & TYPE_INSTANCE_FLAG_RESTRICT) != 0)
>
> /* * Atomic type. If this is set, the corresponding type has an
> _Atomic modifier. */
>
> #define TYPE_ATOMIC(t) \
> - ((TYPE_INSTANCE_FLAGS (t) & TYPE_INSTANCE_FLAG_ATOMIC) != 0)
> + ((((t)->instance_flags ()) & TYPE_INSTANCE_FLAG_ATOMIC) != 0)
>
> /* * True if this type represents either an lvalue or lvalue reference type. */
>
> @@ -297,10 +297,10 @@ DEF_ENUM_FLAGS_TYPE (enum type_instance_flag_value, type_instance_flags);
> is instruction space, and for data objects is data memory. */
>
> #define TYPE_CODE_SPACE(t) \
> - ((TYPE_INSTANCE_FLAGS (t) & TYPE_INSTANCE_FLAG_CODE_SPACE) != 0)
> + ((((t)->instance_flags ()) & TYPE_INSTANCE_FLAG_CODE_SPACE) != 0)
>
> #define TYPE_DATA_SPACE(t) \
> - ((TYPE_INSTANCE_FLAGS (t) & TYPE_INSTANCE_FLAG_DATA_SPACE) != 0)
> + ((((t)->instance_flags ()) & TYPE_INSTANCE_FLAG_DATA_SPACE) != 0)
>
> /* * Address class flags. Some environments provide for pointers
> whose size is different from that of a normal pointer or address
> @@ -309,13 +309,13 @@ DEF_ENUM_FLAGS_TYPE (enum type_instance_flag_value, type_instance_flags);
> target specific ways to represent these different types of address
> classes. */
>
> -#define TYPE_ADDRESS_CLASS_1(t) (TYPE_INSTANCE_FLAGS(t) \
> +#define TYPE_ADDRESS_CLASS_1(t) (((t)->instance_flags ()) \
> & TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1)
> -#define TYPE_ADDRESS_CLASS_2(t) (TYPE_INSTANCE_FLAGS(t) \
> +#define TYPE_ADDRESS_CLASS_2(t) (((t)->instance_flags ()) \
> & TYPE_INSTANCE_FLAG_ADDRESS_CLASS_2)
> #define TYPE_INSTANCE_FLAG_ADDRESS_CLASS_ALL \
> (TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1 | TYPE_INSTANCE_FLAG_ADDRESS_CLASS_2)
> -#define TYPE_ADDRESS_CLASS_ALL(t) (TYPE_INSTANCE_FLAGS(t) \
> +#define TYPE_ADDRESS_CLASS_ALL(t) (((t)->instance_flags ()) \
> & TYPE_INSTANCE_FLAG_ADDRESS_CLASS_ALL)
>
> /* * Information about a single discriminant. */
> @@ -1684,7 +1684,6 @@ extern void allocate_gnat_aux_type (struct type *);
> TYPE_ZALLOC (type, \
> sizeof (*TYPE_MAIN_TYPE (type)->type_specific.func_stuff)))
>
> -#define TYPE_INSTANCE_FLAGS(thistype) ((thistype)->instance_flags ())
> #define TYPE_MAIN_TYPE(thistype) (thistype)->main_type
> #define TYPE_TARGET_TYPE(thistype) TYPE_MAIN_TYPE(thistype)->target_type
> #define TYPE_POINTER_TYPE(thistype) (thistype)->pointer_type
> diff --git a/gdb/stabsread.c b/gdb/stabsread.c
> index 02fc8ccfd2b4..4b1e3b2857aa 100644
> --- a/gdb/stabsread.c
> +++ b/gdb/stabsread.c
> @@ -4473,12 +4473,11 @@ cleanup_undefined_types_1 (void)
>
> if (SYMBOL_CLASS (sym) == LOC_TYPEDEF
> && SYMBOL_DOMAIN (sym) == STRUCT_DOMAIN
> - && (SYMBOL_TYPE (sym)->code () ==
> - (*type)->code ())
> - && (TYPE_INSTANCE_FLAGS (*type) ==
> - TYPE_INSTANCE_FLAGS (SYMBOL_TYPE (sym)))
> + && (SYMBOL_TYPE (sym)->code () == (*type)->code ())
> + && ((*type)->instance_flags ()
> + == SYMBOL_TYPE (sym)->instance_flags ())
> && strcmp (sym->linkage_name (), type_name) == 0)
> - replace_type (*type, SYMBOL_TYPE (sym));
> + replace_type (*type, SYMBOL_TYPE (sym));
> }
> }
> }
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [pushed] gdb: remove TYPE_INSTANCE_FLAGS
2020-09-15 21:28 ` Luis Machado
@ 2020-09-16 2:50 ` Simon Marchi
2020-09-16 11:01 ` Pedro Alves
0 siblings, 1 reply; 14+ messages in thread
From: Simon Marchi @ 2020-09-16 2:50 UTC (permalink / raw)
To: Luis Machado, Pedro Alves, gdb-patches
On 2020-09-15 5:28 p.m., Luis Machado wrote:
> I think you missed adjusting the stale references in gdb/gdb-gdb.py.in.
I wasn't sure what you meant, but I suppose it is:
115 fields.append("instance_flags = %s"
116 % TypeFlagsPrinter(self.val['instance_flags']))
? Indeed, instance_flags there should be changed to m_instance_flags. Does the
patch below look good?
From c99a87806247d5f68a3e4d665dd1abf95b8e77ab Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@efficios.com>
Date: Tue, 15 Sep 2020 22:31:24 -0400
Subject: [PATCH] gdb: update instance_flags field name in gdb-gdb.py.in
Commit 314ad88df63c ("Use type_instance_flags more throughout") changed
the name of field type::instance_flags to type::m_instance_flags. It
however missed changing it in the gdb-gdb.py.in file, which results in
this when trying to use the pretty-printer:
(top-gdb) p *val.type
Traceback (most recent call last):
File "/home/smarchi/build/binutils-gdb/gdb/gdb-gdb.py", line 116, in to_string
% TypeFlagsPrinter(self.val['instance_flags']))
File "/home/smarchi/build/binutils-gdb/gdb/gdb-gdb.py", line 76, in __str__
flag_list = [flag.short_name for flag in TYPE_FLAGS
File "/home/smarchi/build/binutils-gdb/gdb/gdb-gdb.py", line 77, in <listcomp>
if self.val & flag.value]
gdb.error: Argument to arithmetic operation not a number or boolean.
$7 =
This patch fixes it.
gdb/ChangeLog:
* gdb-gdb.py.in (class StructTypePrettyPrinter) <to_string>:
Change instance_flags to m_instance_flags.
Change-Id: Ib5e03c08fe41ca11cd71998f2b1c58052879ce95
---
gdb/gdb-gdb.py.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gdb/gdb-gdb.py.in b/gdb/gdb-gdb.py.in
index 594592d4d16..6594ac10b85 100644
--- a/gdb/gdb-gdb.py.in
+++ b/gdb/gdb-gdb.py.in
@@ -113,7 +113,7 @@ class StructTypePrettyPrinter:
fields.append("reference_type = %s" % self.val['reference_type'])
fields.append("chain = %s" % self.val['reference_type'])
fields.append("instance_flags = %s"
- % TypeFlagsPrinter(self.val['instance_flags']))
+ % TypeFlagsPrinter(self.val['m_instance_flags']))
fields.append("length = %d" % self.val['length'])
fields.append("main_type = %s" % self.val['main_type'])
return "\n{" + ",\n ".join(fields) + "}"
--
2.28.0
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [pushed] gdb: remove TYPE_INSTANCE_FLAGS
2020-09-16 2:50 ` Simon Marchi
@ 2020-09-16 11:01 ` Pedro Alves
2020-09-16 20:44 ` Simon Marchi
0 siblings, 1 reply; 14+ messages in thread
From: Pedro Alves @ 2020-09-16 11:01 UTC (permalink / raw)
To: Simon Marchi, Luis Machado, gdb-patches
On 9/16/20 3:50 AM, Simon Marchi wrote:
> On 2020-09-15 5:28 p.m., Luis Machado wrote:
>> I think you missed adjusting the stale references in gdb/gdb-gdb.py.in.
>
> I wasn't sure what you meant, but I suppose it is:
>
> 115 fields.append("instance_flags = %s"
> 116 % TypeFlagsPrinter(self.val['instance_flags']))
>
> ? Indeed, instance_flags there should be changed to m_instance_flags.
My fault then, sorry about that.
> Does the
> patch below look good?
Looks fine to me.
Thanks for fixing it.
Pedro Alves
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [pushed] gdb: remove TYPE_INSTANCE_FLAGS
2020-09-16 11:01 ` Pedro Alves
@ 2020-09-16 20:44 ` Simon Marchi
0 siblings, 0 replies; 14+ messages in thread
From: Simon Marchi @ 2020-09-16 20:44 UTC (permalink / raw)
To: Pedro Alves, Luis Machado, gdb-patches
On 2020-09-16 7:01 a.m., Pedro Alves wrote:
> On 9/16/20 3:50 AM, Simon Marchi wrote:
>> On 2020-09-15 5:28 p.m., Luis Machado wrote:
>>> I think you missed adjusting the stale references in gdb/gdb-gdb.py.in.
>>
>> I wasn't sure what you meant, but I suppose it is:
>>
>> 115 fields.append("instance_flags = %s"
>> 116 % TypeFlagsPrinter(self.val['instance_flags']))
>>
>> ? Indeed, instance_flags there should be changed to m_instance_flags.
>
> My fault then, sorry about that.
>
>> Does the
>> patch below look good?
>
> Looks fine to me.
>
> Thanks for fixing it.
Thanks, I pushed it.
Simon
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [pushed v2 3/4] Rewrite valid-expr.h's internals in terms of the detection idiom (C++17/N4502)
2020-09-14 21:31 ` [pushed v2 3/4] Rewrite valid-expr.h's internals in terms of the detection idiom (C++17/N4502) Pedro Alves
@ 2020-09-17 10:57 ` Vaseeharan Vinayagamoorthy
2020-09-17 11:41 ` Luis Machado
2020-09-17 16:10 ` Vaseeharan Vinayagamoorthy
0 siblings, 2 replies; 14+ messages in thread
From: Vaseeharan Vinayagamoorthy @ 2020-09-17 10:57 UTC (permalink / raw)
To: Pedro Alves, gdb-patches
Relevant to this patch, I am seeing error: type/value mismatch from valid-expr.h:65:20 when building GDB with:
Build: aarch64-none-linux-gnu
Host: aarch64-none-linux-gnu
Target: aarch64-none-linux-gnu
In file included from binutils-gdb--gdb/gdb/unittests/offset-type-selftests.c:24:0:
/binutils-gdb--gdb/gdb/unittests/offset-type-selftests.c: In substitution of 'template<class Expected, template<class ...> class Op, class ... Args> using is_detected_exact = std::is_same<Expected, typename gdb::detection_detail::detector<gdb::nonesuch, void, Op, Args ...>::type> [with Expected = selftests::offset_type::off_A&; Op = selftests::offset_type::check_valid_expr75::archetype; Args = {selftests::offset_type::off_A, selftests::offset_type::off_B}]':
/binutils-gdb--gdb/gdb/unittests/offset-type-selftests.c:75:1: required from here
/binutils-gdb--gdb/gdb/../gdbsupport/valid-expr.h:65:20: error: type/value mismatch at argument 2 in template parameter list for 'template<class Expected, template<class ...> class Op, class ... Args> using is_detected_exact = std::is_same<Expected, typename gdb::detection_detail::detector<gdb::nonesuch, void, Op, Args ...>::type>'
archetype, TYPES>::value == VALID, \
^
/binutils-gdb--gdb/gdb/../gdbsupport/valid-expr.h:79:3: note: in expansion of macro 'CHECK_VALID_EXPR_INT'
CHECK_VALID_EXPR_INT (ESC_PARENS(typename T1, typename T2), \
^~~~~~~~~~~~~~~~~~~~
/binutils-gdb--gdb/gdb/unittests/offset-type-selftests.c:42:3: note: in expansion of macro 'CHECK_VALID_EXPR_2'
CHECK_VALID_EXPR_2 (off_A, off_B, VALID, EXPR_TYPE, EXPR)
^~~~~~~~~~~~~~~~~~
Regards,
Vasee
On 14/09/2020, 22:31, "Gdb-patches on behalf of Pedro Alves" <gdb-patches-bounces@sourceware.org on behalf of pedro@palves.net> wrote:
An earlier attempt at doing this had failed (wouldn't work in GCCs
around 4.8, IIRC), but now that I try again, it works. I suspect that
my previous attempt did not use the pre C++14-safe void_t (in
traits.h).
I want to switch to this model because:
- It's the standard detection idiom that folks will learn starting
with C++17.
- In the enum_flags unit tests, I have a static_assert that triggers
a warning (resulting in build error), which GCC does not suppress
because the warning is not being triggered in the SFINAE context.
Switching to the detection idiom fixes that. Alternatively,
switching to the C++03-style expression-validity checking with a
varargs overload would allow addressing that, but I think that
would be going backwards idiomatically speaking.
- While this patch shows a net increase of lines of code, the magic
being added to traits.h can be removed in a few years when we start
requiring C++17.
gdbsupport/ChangeLog:
* traits.h (struct nonesuch, struct detector, detected_or)
(detected_or_t, is_detected, detected_t, detected_or)
(detected_or_t, is_detected_exact, is_detected_convertible): New.
* valid-expr.h (CHECK_VALID_EXPR_INT): Use gdb::is_detected_exact.
---
gdbsupport/ChangeLog | 7 ++++++
gdbsupport/traits.h | 67 +++++++++++++++++++++++++++++++++++++++++++++++++
gdbsupport/valid-expr.h | 20 +++------------
3 files changed, 77 insertions(+), 17 deletions(-)
diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog
index 6cda6050f9..4858cc6b56 100644
--- a/gdbsupport/ChangeLog
+++ b/gdbsupport/ChangeLog
@@ -1,3 +1,10 @@
+2020-09-14 Pedro Alves <pedro@palves.net>
+
+ * traits.h (struct nonesuch, struct detector, detected_or)
+ (detected_or_t, is_detected, detected_t, detected_or)
+ (detected_or_t, is_detected_exact, is_detected_convertible): New.
+ * valid-expr.h (CHECK_VALID_EXPR_INT): Use gdb::is_detected_exact.
+
2020-09-10 Kamil Rytarowski <n54@gmx.com>
* eintr.h: New file.
diff --git a/gdbsupport/traits.h b/gdbsupport/traits.h
index 2a6f00654c..93b609ac10 100644
--- a/gdbsupport/traits.h
+++ b/gdbsupport/traits.h
@@ -52,6 +52,73 @@ struct make_void { typedef void type; };
template<typename... Ts>
using void_t = typename make_void<Ts...>::type;
+/* Implementation of the detection idiom:
+
+ - http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4502.pdf
+ - http://en.cppreference.com/w/cpp/experimental/is_detected
+
+*/
+
+struct nonesuch
+{
+ nonesuch () = delete;
+ ~nonesuch () = delete;
+ nonesuch (const nonesuch &) = delete;
+ void operator= (const nonesuch &) = delete;
+};
+
+namespace detection_detail {
+/* Implementation of the detection idiom (negative case). */
+template<typename Default, typename AlwaysVoid,
+ template<typename...> class Op, typename... Args>
+struct detector
+{
+ using value_t = std::false_type;
+ using type = Default;
+};
+
+/* Implementation of the detection idiom (positive case). */
+template<typename Default, template<typename...> class Op, typename... Args>
+struct detector<Default, void_t<Op<Args...>>, Op, Args...>
+{
+ using value_t = std::true_type;
+ using type = Op<Args...>;
+};
+
+/* Detect whether Op<Args...> is a valid type, use Default if not. */
+template<typename Default, template<typename...> class Op,
+ typename... Args>
+using detected_or = detector<Default, void, Op, Args...>;
+
+/* Op<Args...> if that is a valid type, otherwise Default. */
+template<typename Default, template<typename...> class Op,
+ typename... Args>
+using detected_or_t
+ = typename detected_or<Default, Op, Args...>::type;
+
+} /* detection_detail */
+
+template<template<typename...> class Op, typename... Args>
+using is_detected
+ = typename detection_detail::detector<nonesuch, void, Op, Args...>::value_t;
+
+template<template<typename...> class Op, typename... Args>
+using detected_t
+ = typename detection_detail::detector<nonesuch, void, Op, Args...>::type;
+
+template<typename Default, template<typename...> class Op, typename... Args>
+using detected_or = detection_detail::detected_or<Default, Op, Args...>;
+
+template<typename Default, template<typename...> class Op, typename... Args>
+using detected_or_t = typename detected_or<Default, Op, Args...>::type;
+
+template<typename Expected, template<typename...> class Op, typename... Args>
+using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
+
+template<typename To, template<typename...> class Op, typename... Args>
+using is_detected_convertible
+ = std::is_convertible<detected_t<Op, Args...>, To>;
+
/* A few trait helpers, mainly stolen from libstdc++. Uppercase
because "and/or", etc. are reserved keywords. */
diff --git a/gdbsupport/valid-expr.h b/gdbsupport/valid-expr.h
index b1c8446814..a22fa61134 100644
--- a/gdbsupport/valid-expr.h
+++ b/gdbsupport/valid-expr.h
@@ -58,26 +58,12 @@
#define CHECK_VALID_EXPR_INT(TYPENAMES, TYPES, VALID, EXPR_TYPE, EXPR) \
namespace CONCAT (check_valid_expr, __LINE__) { \
\
- template<typename, typename, typename = void> \
- struct is_valid_expression \
- : std::false_type {}; \
- \
template <TYPENAMES> \
- struct is_valid_expression<TYPES, gdb::void_t<decltype (EXPR)>> \
- : std::true_type {}; \
+ using archetype = decltype (EXPR); \
\
- static_assert (is_valid_expression<TYPES>::value == VALID, \
+ static_assert (gdb::is_detected_exact<EXPR_TYPE, \
+ archetype, TYPES>::value == VALID, \
""); \
- \
- template<TYPENAMES, typename = void> \
- struct is_same_type \
- : std::is_same<EXPR_TYPE, void> {}; \
- \
- template <TYPENAMES> \
- struct is_same_type<TYPES, gdb::void_t<decltype (EXPR)>> \
- : std::is_same<EXPR_TYPE, decltype (EXPR)> {}; \
- \
- static_assert (is_same_type<TYPES>::value, ""); \
} /* namespace */
/* A few convenience macros that support expressions involving a
--
2.14.5
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [pushed v2 3/4] Rewrite valid-expr.h's internals in terms of the detection idiom (C++17/N4502)
2020-09-17 10:57 ` Vaseeharan Vinayagamoorthy
@ 2020-09-17 11:41 ` Luis Machado
2020-09-17 16:10 ` Vaseeharan Vinayagamoorthy
1 sibling, 0 replies; 14+ messages in thread
From: Luis Machado @ 2020-09-17 11:41 UTC (permalink / raw)
To: Vaseeharan Vinayagamoorthy, Pedro Alves, gdb-patches
On 9/17/20 7:57 AM, Vaseeharan Vinayagamoorthy wrote:
> Relevant to this patch, I am seeing error: type/value mismatch from valid-expr.h:65:20 when building GDB with:
> Build: aarch64-none-linux-gnu
> Host: aarch64-none-linux-gnu
> Target: aarch64-none-linux-gnu
>
>
> In file included from binutils-gdb--gdb/gdb/unittests/offset-type-selftests.c:24:0:
> /binutils-gdb--gdb/gdb/unittests/offset-type-selftests.c: In substitution of 'template<class Expected, template<class ...> class Op, class ... Args> using is_detected_exact = std::is_same<Expected, typename gdb::detection_detail::detector<gdb::nonesuch, void, Op, Args ...>::type> [with Expected = selftests::offset_type::off_A&; Op = selftests::offset_type::check_valid_expr75::archetype; Args = {selftests::offset_type::off_A, selftests::offset_type::off_B}]':
>
> /binutils-gdb--gdb/gdb/unittests/offset-type-selftests.c:75:1: required from here
> /binutils-gdb--gdb/gdb/../gdbsupport/valid-expr.h:65:20: error: type/value mismatch at argument 2 in template parameter list for 'template<class Expected, template<class ...> class Op, class ... Args> using is_detected_exact = std::is_same<Expected, typename gdb::detection_detail::detector<gdb::nonesuch, void, Op, Args ...>::type>'
> archetype, TYPES>::value == VALID, \
> ^
> /binutils-gdb--gdb/gdb/../gdbsupport/valid-expr.h:79:3: note: in expansion of macro 'CHECK_VALID_EXPR_INT'
> CHECK_VALID_EXPR_INT (ESC_PARENS(typename T1, typename T2), \
> ^~~~~~~~~~~~~~~~~~~~
> /binutils-gdb--gdb/gdb/unittests/offset-type-selftests.c:42:3: note: in expansion of macro 'CHECK_VALID_EXPR_2'
> CHECK_VALID_EXPR_2 (off_A, off_B, VALID, EXPR_TYPE, EXPR)
> ^~~~~~~~~~~~~~~~~~
>
>
>
> Regards,
> Vasee
I haven't seen this. It's been building fine so far. What type of system
are you using? I'm on Ubuntu 18.04 with GCC 7.5.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [pushed v2 3/4] Rewrite valid-expr.h's internals in terms of the detection idiom (C++17/N4502)
2020-09-17 10:57 ` Vaseeharan Vinayagamoorthy
2020-09-17 11:41 ` Luis Machado
@ 2020-09-17 16:10 ` Vaseeharan Vinayagamoorthy
2020-09-17 16:23 ` Luis Machado
1 sibling, 1 reply; 14+ messages in thread
From: Vaseeharan Vinayagamoorthy @ 2020-09-17 16:10 UTC (permalink / raw)
To: Pedro Alves, gdb-patches, Luis Machado
I observe this error when building on an aarch64-none-linux-gnu machine, running ubuntu 14.04.5.
The compiler it is using is aarch64-none-linux-gnu-gcc version 6.4.1.
On 17/09/2020, 11:58, "Gdb-patches on behalf of Vaseeharan Vinayagamoorthy" <gdb-patches-bounces@sourceware.org on behalf of Vaseeharan.Vinayagamoorthy@arm.com> wrote:
Relevant to this patch, I am seeing error: type/value mismatch from valid-expr.h:65:20 when building GDB with:
Build: aarch64-none-linux-gnu
Host: aarch64-none-linux-gnu
Target: aarch64-none-linux-gnu
In file included from binutils-gdb--gdb/gdb/unittests/offset-type-selftests.c:24:0:
/binutils-gdb--gdb/gdb/unittests/offset-type-selftests.c: In substitution of 'template<class Expected, template<class ...> class Op, class ... Args> using is_detected_exact = std::is_same<Expected, typename gdb::detection_detail::detector<gdb::nonesuch, void, Op, Args ...>::type> [with Expected = selftests::offset_type::off_A&; Op = selftests::offset_type::check_valid_expr75::archetype; Args = {selftests::offset_type::off_A, selftests::offset_type::off_B}]':
/binutils-gdb--gdb/gdb/unittests/offset-type-selftests.c:75:1: required from here
/binutils-gdb--gdb/gdb/../gdbsupport/valid-expr.h:65:20: error: type/value mismatch at argument 2 in template parameter list for 'template<class Expected, template<class ...> class Op, class ... Args> using is_detected_exact = std::is_same<Expected, typename gdb::detection_detail::detector<gdb::nonesuch, void, Op, Args ...>::type>'
archetype, TYPES>::value == VALID, \
^
/binutils-gdb--gdb/gdb/../gdbsupport/valid-expr.h:79:3: note: in expansion of macro 'CHECK_VALID_EXPR_INT'
CHECK_VALID_EXPR_INT (ESC_PARENS(typename T1, typename T2), \
^~~~~~~~~~~~~~~~~~~~
/binutils-gdb--gdb/gdb/unittests/offset-type-selftests.c:42:3: note: in expansion of macro 'CHECK_VALID_EXPR_2'
CHECK_VALID_EXPR_2 (off_A, off_B, VALID, EXPR_TYPE, EXPR)
^~~~~~~~~~~~~~~~~~
Regards,
Vasee
On 14/09/2020, 22:31, "Gdb-patches on behalf of Pedro Alves" <gdb-patches-bounces@sourceware.org on behalf of pedro@palves.net> wrote:
An earlier attempt at doing this had failed (wouldn't work in GCCs
around 4.8, IIRC), but now that I try again, it works. I suspect that
my previous attempt did not use the pre C++14-safe void_t (in
traits.h).
I want to switch to this model because:
- It's the standard detection idiom that folks will learn starting
with C++17.
- In the enum_flags unit tests, I have a static_assert that triggers
a warning (resulting in build error), which GCC does not suppress
because the warning is not being triggered in the SFINAE context.
Switching to the detection idiom fixes that. Alternatively,
switching to the C++03-style expression-validity checking with a
varargs overload would allow addressing that, but I think that
would be going backwards idiomatically speaking.
- While this patch shows a net increase of lines of code, the magic
being added to traits.h can be removed in a few years when we start
requiring C++17.
gdbsupport/ChangeLog:
* traits.h (struct nonesuch, struct detector, detected_or)
(detected_or_t, is_detected, detected_t, detected_or)
(detected_or_t, is_detected_exact, is_detected_convertible): New.
* valid-expr.h (CHECK_VALID_EXPR_INT): Use gdb::is_detected_exact.
---
gdbsupport/ChangeLog | 7 ++++++
gdbsupport/traits.h | 67 +++++++++++++++++++++++++++++++++++++++++++++++++
gdbsupport/valid-expr.h | 20 +++------------
3 files changed, 77 insertions(+), 17 deletions(-)
diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog
index 6cda6050f9..4858cc6b56 100644
--- a/gdbsupport/ChangeLog
+++ b/gdbsupport/ChangeLog
@@ -1,3 +1,10 @@
+2020-09-14 Pedro Alves <pedro@palves.net>
+
+ * traits.h (struct nonesuch, struct detector, detected_or)
+ (detected_or_t, is_detected, detected_t, detected_or)
+ (detected_or_t, is_detected_exact, is_detected_convertible): New.
+ * valid-expr.h (CHECK_VALID_EXPR_INT): Use gdb::is_detected_exact.
+
2020-09-10 Kamil Rytarowski <n54@gmx.com>
* eintr.h: New file.
diff --git a/gdbsupport/traits.h b/gdbsupport/traits.h
index 2a6f00654c..93b609ac10 100644
--- a/gdbsupport/traits.h
+++ b/gdbsupport/traits.h
@@ -52,6 +52,73 @@ struct make_void { typedef void type; };
template<typename... Ts>
using void_t = typename make_void<Ts...>::type;
+/* Implementation of the detection idiom:
+
+ - http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4502.pdf
+ - http://en.cppreference.com/w/cpp/experimental/is_detected
+
+*/
+
+struct nonesuch
+{
+ nonesuch () = delete;
+ ~nonesuch () = delete;
+ nonesuch (const nonesuch &) = delete;
+ void operator= (const nonesuch &) = delete;
+};
+
+namespace detection_detail {
+/* Implementation of the detection idiom (negative case). */
+template<typename Default, typename AlwaysVoid,
+ template<typename...> class Op, typename... Args>
+struct detector
+{
+ using value_t = std::false_type;
+ using type = Default;
+};
+
+/* Implementation of the detection idiom (positive case). */
+template<typename Default, template<typename...> class Op, typename... Args>
+struct detector<Default, void_t<Op<Args...>>, Op, Args...>
+{
+ using value_t = std::true_type;
+ using type = Op<Args...>;
+};
+
+/* Detect whether Op<Args...> is a valid type, use Default if not. */
+template<typename Default, template<typename...> class Op,
+ typename... Args>
+using detected_or = detector<Default, void, Op, Args...>;
+
+/* Op<Args...> if that is a valid type, otherwise Default. */
+template<typename Default, template<typename...> class Op,
+ typename... Args>
+using detected_or_t
+ = typename detected_or<Default, Op, Args...>::type;
+
+} /* detection_detail */
+
+template<template<typename...> class Op, typename... Args>
+using is_detected
+ = typename detection_detail::detector<nonesuch, void, Op, Args...>::value_t;
+
+template<template<typename...> class Op, typename... Args>
+using detected_t
+ = typename detection_detail::detector<nonesuch, void, Op, Args...>::type;
+
+template<typename Default, template<typename...> class Op, typename... Args>
+using detected_or = detection_detail::detected_or<Default, Op, Args...>;
+
+template<typename Default, template<typename...> class Op, typename... Args>
+using detected_or_t = typename detected_or<Default, Op, Args...>::type;
+
+template<typename Expected, template<typename...> class Op, typename... Args>
+using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
+
+template<typename To, template<typename...> class Op, typename... Args>
+using is_detected_convertible
+ = std::is_convertible<detected_t<Op, Args...>, To>;
+
/* A few trait helpers, mainly stolen from libstdc++. Uppercase
because "and/or", etc. are reserved keywords. */
diff --git a/gdbsupport/valid-expr.h b/gdbsupport/valid-expr.h
index b1c8446814..a22fa61134 100644
--- a/gdbsupport/valid-expr.h
+++ b/gdbsupport/valid-expr.h
@@ -58,26 +58,12 @@
#define CHECK_VALID_EXPR_INT(TYPENAMES, TYPES, VALID, EXPR_TYPE, EXPR) \
namespace CONCAT (check_valid_expr, __LINE__) { \
\
- template<typename, typename, typename = void> \
- struct is_valid_expression \
- : std::false_type {}; \
- \
template <TYPENAMES> \
- struct is_valid_expression<TYPES, gdb::void_t<decltype (EXPR)>> \
- : std::true_type {}; \
+ using archetype = decltype (EXPR); \
\
- static_assert (is_valid_expression<TYPES>::value == VALID, \
+ static_assert (gdb::is_detected_exact<EXPR_TYPE, \
+ archetype, TYPES>::value == VALID, \
""); \
- \
- template<TYPENAMES, typename = void> \
- struct is_same_type \
- : std::is_same<EXPR_TYPE, void> {}; \
- \
- template <TYPENAMES> \
- struct is_same_type<TYPES, gdb::void_t<decltype (EXPR)>> \
- : std::is_same<EXPR_TYPE, decltype (EXPR)> {}; \
- \
- static_assert (is_same_type<TYPES>::value, ""); \
} /* namespace */
/* A few convenience macros that support expressions involving a
--
2.14.5
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [pushed v2 3/4] Rewrite valid-expr.h's internals in terms of the detection idiom (C++17/N4502)
2020-09-17 16:10 ` Vaseeharan Vinayagamoorthy
@ 2020-09-17 16:23 ` Luis Machado
0 siblings, 0 replies; 14+ messages in thread
From: Luis Machado @ 2020-09-17 16:23 UTC (permalink / raw)
To: Vaseeharan Vinayagamoorthy, Pedro Alves, gdb-patches
Ok. Even though 14.04 is no longer supported, I suspect GCC 6.4.1 is
still fairly recent that we shouldn't be seeing this.
On 9/17/20 1:10 PM, Vaseeharan Vinayagamoorthy wrote:
> I observe this error when building on an aarch64-none-linux-gnu machine, running ubuntu 14.04.5.
> The compiler it is using is aarch64-none-linux-gnu-gcc version 6.4.1.
>
>
> On 17/09/2020, 11:58, "Gdb-patches on behalf of Vaseeharan Vinayagamoorthy" <gdb-patches-bounces@sourceware.org on behalf of Vaseeharan.Vinayagamoorthy@arm.com> wrote:
>
> Relevant to this patch, I am seeing error: type/value mismatch from valid-expr.h:65:20 when building GDB with:
> Build: aarch64-none-linux-gnu
> Host: aarch64-none-linux-gnu
> Target: aarch64-none-linux-gnu
>
>
> In file included from binutils-gdb--gdb/gdb/unittests/offset-type-selftests.c:24:0:
> /binutils-gdb--gdb/gdb/unittests/offset-type-selftests.c: In substitution of 'template<class Expected, template<class ...> class Op, class ... Args> using is_detected_exact = std::is_same<Expected, typename gdb::detection_detail::detector<gdb::nonesuch, void, Op, Args ...>::type> [with Expected = selftests::offset_type::off_A&; Op = selftests::offset_type::check_valid_expr75::archetype; Args = {selftests::offset_type::off_A, selftests::offset_type::off_B}]':
>
> /binutils-gdb--gdb/gdb/unittests/offset-type-selftests.c:75:1: required from here
> /binutils-gdb--gdb/gdb/../gdbsupport/valid-expr.h:65:20: error: type/value mismatch at argument 2 in template parameter list for 'template<class Expected, template<class ...> class Op, class ... Args> using is_detected_exact = std::is_same<Expected, typename gdb::detection_detail::detector<gdb::nonesuch, void, Op, Args ...>::type>'
> archetype, TYPES>::value == VALID, \
> ^
> /binutils-gdb--gdb/gdb/../gdbsupport/valid-expr.h:79:3: note: in expansion of macro 'CHECK_VALID_EXPR_INT'
> CHECK_VALID_EXPR_INT (ESC_PARENS(typename T1, typename T2), \
> ^~~~~~~~~~~~~~~~~~~~
> /binutils-gdb--gdb/gdb/unittests/offset-type-selftests.c:42:3: note: in expansion of macro 'CHECK_VALID_EXPR_2'
> CHECK_VALID_EXPR_2 (off_A, off_B, VALID, EXPR_TYPE, EXPR)
> ^~~~~~~~~~~~~~~~~~
>
>
>
> Regards,
> Vasee
>
>
>
>
> On 14/09/2020, 22:31, "Gdb-patches on behalf of Pedro Alves" <gdb-patches-bounces@sourceware.org on behalf of pedro@palves.net> wrote:
>
> An earlier attempt at doing this had failed (wouldn't work in GCCs
> around 4.8, IIRC), but now that I try again, it works. I suspect that
> my previous attempt did not use the pre C++14-safe void_t (in
> traits.h).
>
> I want to switch to this model because:
>
> - It's the standard detection idiom that folks will learn starting
> with C++17.
>
> - In the enum_flags unit tests, I have a static_assert that triggers
> a warning (resulting in build error), which GCC does not suppress
> because the warning is not being triggered in the SFINAE context.
> Switching to the detection idiom fixes that. Alternatively,
> switching to the C++03-style expression-validity checking with a
> varargs overload would allow addressing that, but I think that
> would be going backwards idiomatically speaking.
>
> - While this patch shows a net increase of lines of code, the magic
> being added to traits.h can be removed in a few years when we start
> requiring C++17.
>
> gdbsupport/ChangeLog:
>
> * traits.h (struct nonesuch, struct detector, detected_or)
> (detected_or_t, is_detected, detected_t, detected_or)
> (detected_or_t, is_detected_exact, is_detected_convertible): New.
> * valid-expr.h (CHECK_VALID_EXPR_INT): Use gdb::is_detected_exact.
> ---
> gdbsupport/ChangeLog | 7 ++++++
> gdbsupport/traits.h | 67 +++++++++++++++++++++++++++++++++++++++++++++++++
> gdbsupport/valid-expr.h | 20 +++------------
> 3 files changed, 77 insertions(+), 17 deletions(-)
>
> diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog
> index 6cda6050f9..4858cc6b56 100644
> --- a/gdbsupport/ChangeLog
> +++ b/gdbsupport/ChangeLog
> @@ -1,3 +1,10 @@
> +2020-09-14 Pedro Alves <pedro@palves.net>
> +
> + * traits.h (struct nonesuch, struct detector, detected_or)
> + (detected_or_t, is_detected, detected_t, detected_or)
> + (detected_or_t, is_detected_exact, is_detected_convertible): New.
> + * valid-expr.h (CHECK_VALID_EXPR_INT): Use gdb::is_detected_exact.
> +
> 2020-09-10 Kamil Rytarowski <n54@gmx.com>
>
> * eintr.h: New file.
> diff --git a/gdbsupport/traits.h b/gdbsupport/traits.h
> index 2a6f00654c..93b609ac10 100644
> --- a/gdbsupport/traits.h
> +++ b/gdbsupport/traits.h
> @@ -52,6 +52,73 @@ struct make_void { typedef void type; };
> template<typename... Ts>
> using void_t = typename make_void<Ts...>::type;
>
> +/* Implementation of the detection idiom:
> +
> + - http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4502.pdf
> + - http://en.cppreference.com/w/cpp/experimental/is_detected
> +
> +*/
> +
> +struct nonesuch
> +{
> + nonesuch () = delete;
> + ~nonesuch () = delete;
> + nonesuch (const nonesuch &) = delete;
> + void operator= (const nonesuch &) = delete;
> +};
> +
> +namespace detection_detail {
> +/* Implementation of the detection idiom (negative case). */
> +template<typename Default, typename AlwaysVoid,
> + template<typename...> class Op, typename... Args>
> +struct detector
> +{
> + using value_t = std::false_type;
> + using type = Default;
> +};
> +
> +/* Implementation of the detection idiom (positive case). */
> +template<typename Default, template<typename...> class Op, typename... Args>
> +struct detector<Default, void_t<Op<Args...>>, Op, Args...>
> +{
> + using value_t = std::true_type;
> + using type = Op<Args...>;
> +};
> +
> +/* Detect whether Op<Args...> is a valid type, use Default if not. */
> +template<typename Default, template<typename...> class Op,
> + typename... Args>
> +using detected_or = detector<Default, void, Op, Args...>;
> +
> +/* Op<Args...> if that is a valid type, otherwise Default. */
> +template<typename Default, template<typename...> class Op,
> + typename... Args>
> +using detected_or_t
> + = typename detected_or<Default, Op, Args...>::type;
> +
> +} /* detection_detail */
> +
> +template<template<typename...> class Op, typename... Args>
> +using is_detected
> + = typename detection_detail::detector<nonesuch, void, Op, Args...>::value_t;
> +
> +template<template<typename...> class Op, typename... Args>
> +using detected_t
> + = typename detection_detail::detector<nonesuch, void, Op, Args...>::type;
> +
> +template<typename Default, template<typename...> class Op, typename... Args>
> +using detected_or = detection_detail::detected_or<Default, Op, Args...>;
> +
> +template<typename Default, template<typename...> class Op, typename... Args>
> +using detected_or_t = typename detected_or<Default, Op, Args...>::type;
> +
> +template<typename Expected, template<typename...> class Op, typename... Args>
> +using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
> +
> +template<typename To, template<typename...> class Op, typename... Args>
> +using is_detected_convertible
> + = std::is_convertible<detected_t<Op, Args...>, To>;
> +
> /* A few trait helpers, mainly stolen from libstdc++. Uppercase
> because "and/or", etc. are reserved keywords. */
>
> diff --git a/gdbsupport/valid-expr.h b/gdbsupport/valid-expr.h
> index b1c8446814..a22fa61134 100644
> --- a/gdbsupport/valid-expr.h
> +++ b/gdbsupport/valid-expr.h
> @@ -58,26 +58,12 @@
> #define CHECK_VALID_EXPR_INT(TYPENAMES, TYPES, VALID, EXPR_TYPE, EXPR) \
> namespace CONCAT (check_valid_expr, __LINE__) { \
> \
> - template<typename, typename, typename = void> \
> - struct is_valid_expression \
> - : std::false_type {}; \
> - \
> template <TYPENAMES> \
> - struct is_valid_expression<TYPES, gdb::void_t<decltype (EXPR)>> \
> - : std::true_type {}; \
> + using archetype = decltype (EXPR); \
> \
> - static_assert (is_valid_expression<TYPES>::value == VALID, \
> + static_assert (gdb::is_detected_exact<EXPR_TYPE, \
> + archetype, TYPES>::value == VALID, \
> ""); \
> - \
> - template<TYPENAMES, typename = void> \
> - struct is_same_type \
> - : std::is_same<EXPR_TYPE, void> {}; \
> - \
> - template <TYPENAMES> \
> - struct is_same_type<TYPES, gdb::void_t<decltype (EXPR)>> \
> - : std::is_same<EXPR_TYPE, decltype (EXPR)> {}; \
> - \
> - static_assert (is_same_type<TYPES>::value, ""); \
> } /* namespace */
>
> /* A few convenience macros that support expressions involving a
> --
> 2.14.5
>
>
>
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2020-09-17 16:23 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-14 21:31 [pushed v2 0/4] Rewrite enum_flags, add unit tests, fix problems Pedro Alves
2020-09-14 21:31 ` [pushed v2 1/4] Use type_instance_flags more throughout Pedro Alves
2020-09-15 2:28 ` [pushed] gdb: remove TYPE_INSTANCE_FLAGS Simon Marchi
2020-09-15 21:28 ` Luis Machado
2020-09-16 2:50 ` Simon Marchi
2020-09-16 11:01 ` Pedro Alves
2020-09-16 20:44 ` Simon Marchi
2020-09-14 21:31 ` [pushed v2 2/4] Rename address_space_int_to_name/address_space_name_to_int Pedro Alves
2020-09-14 21:31 ` [pushed v2 3/4] Rewrite valid-expr.h's internals in terms of the detection idiom (C++17/N4502) Pedro Alves
2020-09-17 10:57 ` Vaseeharan Vinayagamoorthy
2020-09-17 11:41 ` Luis Machado
2020-09-17 16:10 ` Vaseeharan Vinayagamoorthy
2020-09-17 16:23 ` Luis Machado
2020-09-14 21:31 ` [pushed v2 4/4] Rewrite enum_flags, add unit tests, fix problems Pedro Alves
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).