[PR,gdb/25325] Fix attributes of typed enums of typedefs

Message ID 20200403195706.4862-1-ssbssa@yahoo.de
State New
Headers show
Series
  • [PR,gdb/25325] Fix attributes of typed enums of typedefs
Related show

Commit Message

Pedro Alves via Gdb-patches April 3, 2020, 7:57 p.m.
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.
---
 gdb/dwarf2/read.c                   | 10 +++++----
 gdb/testsuite/gdb.cp/typed-enum.cc  | 35 +++++++++++++++++++++++++++++
 gdb/testsuite/gdb.cp/typed-enum.exp | 31 +++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 gdb/testsuite/gdb.cp/typed-enum.cc
 create mode 100644 gdb/testsuite/gdb.cp/typed-enum.exp

-- 
2.26.0

Comments

Tom Tromey April 3, 2020, 8:02 p.m. | #1
>>>>> "Hannes" == Hannes Domani via Gdb-patches <gdb-patches@sourceware.org> writes:


Hannes> gdb/ChangeLog:

Hannes> 2020-04-03  Hannes Domani  <ssbssa@yahoo.de>

Hannes> 	PR gdb/25325
Hannes> 	* dwarf2/read.c (read_enumeration_type): Fix typed enum attributes.

Hannes> gdb/testsuite/ChangeLog:

Hannes> 2020-04-03  Hannes Domani  <ssbssa@yahoo.de>

Hannes> 	PR gdb/25325
Hannes> 	* gdb.cp/typed-enum.cc: New test.
Hannes> 	* gdb.cp/typed-enum.exp: New file.

Thank you.  This is ok.

Tom
Pedro Alves via Gdb-patches April 3, 2020, 8:14 p.m. | #2
Am Freitag, 3. April 2020, 22:02:42 MESZ hat Tom Tromey <tom@tromey.com> Folgendes geschrieben:

> >>>>> "Hannes" == Hannes Domani via Gdb-patches <gdb-patches@sourceware.org> writes:

>

> Hannes> gdb/ChangeLog:

>

> Hannes> 2020-04-03  Hannes Domani  <ssbssa@yahoo.de>

>

> Hannes>     PR gdb/25325

> Hannes>     * dwarf2/read.c (read_enumeration_type): Fix typed enum attributes.

>

> Hannes> gdb/testsuite/ChangeLog:

>

> Hannes> 2020-04-03  Hannes Domani  <ssbssa@yahoo.de>

>

> Hannes>     PR gdb/25325

> Hannes>     * gdb.cp/typed-enum.cc: New test.

> Hannes>     * gdb.cp/typed-enum.exp: New file.

>

> Thank you.  This is ok.


Pushed, thanks.


Hannes

Patch

diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 6ee33fcd6e..0912788ac0 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -15525,12 +15525,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/gdb.cp/typed-enum.cc b/gdb/testsuite/gdb.cp/typed-enum.cc
new file mode 100644
index 0000000000..caf4288fff
--- /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 0000000000..0427b79279
--- /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"