public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] Fix attributes of typed enums of typedefs
@ 2020-04-03 20:13 Hannes Domani
0 siblings, 0 replies; only message in thread
From: Hannes Domani @ 2020-04-03 20:13 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=9e7c9a03eefafae549dafa8bec13232a780804ef
commit 9e7c9a03eefafae549dafa8bec13232a780804ef
Author: Hannes Domani <ssbssa@yahoo.de>
Date: Fri Apr 3 21:38:31 2020 +0200
Fix attributes of typed enums of typedefs
For this enum:
typedef unsigned char byte;
enum byte_enum : byte
{
byte_val = 128
};
The unsigned attribute is not set:
(gdb) p byte_val
$1 = -128
That's because it uses the attributes of the 'byte' typedef for the enum.
So this changes it to use the attributes of the underlying 'unsigned char'
instead.
gdb/ChangeLog:
2020-04-03 Hannes Domani <ssbssa@yahoo.de>
PR gdb/25325
* dwarf2/read.c (read_enumeration_type): Fix typed enum attributes.
gdb/testsuite/ChangeLog:
2020-04-03 Hannes Domani <ssbssa@yahoo.de>
PR gdb/25325
* gdb.cp/typed-enum.cc: New test.
* gdb.cp/typed-enum.exp: New file.
Diff:
---
gdb/ChangeLog | 5 +++++
gdb/dwarf2/read.c | 10 ++++++----
gdb/testsuite/ChangeLog | 6 ++++++
gdb/testsuite/gdb.cp/typed-enum.cc | 35 +++++++++++++++++++++++++++++++++++
gdb/testsuite/gdb.cp/typed-enum.exp | 31 +++++++++++++++++++++++++++++++
5 files changed, 83 insertions(+), 4 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 86d949b212c..014752e4ddc 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2020-04-03 Hannes Domani <ssbssa@yahoo.de>
+
+ PR gdb/25325
+ * dwarf2/read.c (read_enumeration_type): Fix typed enum attributes.
+
2020-04-03 Tom Tromey <tromey@adacore.com>
* dwarf2/loc.c (disassemble_dwarf_expression) <DW_OP_const_type>:
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 0df5676c4d3..bcc3116071e 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -15553,12 +15553,14 @@ read_enumeration_type (struct die_info *die, struct dwarf2_cu *cu)
the underlying type if needed. */
if (TYPE_TARGET_TYPE (type) != NULL && !TYPE_STUB (TYPE_TARGET_TYPE (type)))
{
- TYPE_UNSIGNED (type) = TYPE_UNSIGNED (TYPE_TARGET_TYPE (type));
+ struct type *underlying_type = TYPE_TARGET_TYPE (type);
+ underlying_type = check_typedef (underlying_type);
+ TYPE_UNSIGNED (type) = TYPE_UNSIGNED (underlying_type);
if (TYPE_LENGTH (type) == 0)
- TYPE_LENGTH (type) = TYPE_LENGTH (TYPE_TARGET_TYPE (type));
+ TYPE_LENGTH (type) = TYPE_LENGTH (underlying_type);
if (TYPE_RAW_ALIGN (type) == 0
- && TYPE_RAW_ALIGN (TYPE_TARGET_TYPE (type)) != 0)
- set_type_align (type, TYPE_RAW_ALIGN (TYPE_TARGET_TYPE (type)));
+ && TYPE_RAW_ALIGN (underlying_type) != 0)
+ set_type_align (type, TYPE_RAW_ALIGN (underlying_type));
}
TYPE_DECLARED_CLASS (type) = dwarf2_flag_true_p (die, DW_AT_enum_class, cu);
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f794bbd0d3c..226a0702fe3 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2020-04-03 Hannes Domani <ssbssa@yahoo.de>
+
+ PR gdb/25325
+ * gdb.cp/typed-enum.cc: New test.
+ * gdb.cp/typed-enum.exp: New file.
+
2020-04-02 Andrew Burgess <andrew.burgess@embecosm.com>
* gdb.dwarf2/dw2-inline-small-func-lbls.c: New file.
diff --git a/gdb/testsuite/gdb.cp/typed-enum.cc b/gdb/testsuite/gdb.cp/typed-enum.cc
new file mode 100644
index 00000000000..caf4288fff7
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/typed-enum.cc
@@ -0,0 +1,35 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2020 Free Software Foundation, Inc.
+
+ 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/>. */
+
+typedef unsigned char byte;
+
+enum byte_enum : byte
+{
+ byte_val = 128
+};
+
+enum uchar_enum : unsigned char
+{
+ uchar_val = 128
+};
+
+int main()
+{
+ int v1 = byte_val;
+ int v2 = uchar_val;
+ return v1 == v2;
+}
diff --git a/gdb/testsuite/gdb.cp/typed-enum.exp b/gdb/testsuite/gdb.cp/typed-enum.exp
new file mode 100644
index 00000000000..0427b792790
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/typed-enum.exp
@@ -0,0 +1,31 @@
+# Copyright 2020 Free Software Foundation, Inc.
+
+# 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/>.
+#
+# Check if unsigned typedef are handled correctly with typed enums.
+
+if { [skip_cplus_tests] } { continue }
+
+standard_testfile .cc
+
+if [get_compiler_info "c++"] {
+ return -1
+}
+
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
+ return -1
+}
+
+gdb_test "print (int)byte_val" "= 128"
+gdb_test "print (int)uchar_val" "= 128"
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-04-03 20:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-03 20:13 [binutils-gdb] Fix attributes of typed enums of typedefs Hannes Domani
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).