aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Roirand <roirand@adacore.com>2018-09-10 10:34:59 -0500
committerJoel Brobecker <brobecker@adacore.com>2018-09-10 11:34:59 -0400
commitcc330e39bc938cefd4cfc581639177ef4c6bcbe3 (patch)
tree641ae04ebbc20a33e606918ee96eeeb83cf53837
parentb9c50e9a9ac48662b2132583c52d46976efb3512 (diff)
downloadgdb-cc330e39bc938cefd4cfc581639177ef4c6bcbe3.zip
gdb-cc330e39bc938cefd4cfc581639177ef4c6bcbe3.tar.gz
gdb-cc330e39bc938cefd4cfc581639177ef4c6bcbe3.tar.bz2
(Ada) Fix printing of access to unconstrained arrays
Using this Ada code: type String_Access is access String; type Array_Of_String is array (1 .. 2) of String_Access; Aos : Array_Of_String := (new String'("ab"), new String'("cd")); When debugging with GDB, printing each Aos element displays: (gdb) print Aos(1) $2 = "ab" (gdb) print Aos(2) $3 = "cd" Whereas it should display: (gdb) print Aos(1) $2 = (foo_r118_024.string_access) 0x635018 (gdb) print Aos(2) $3 = (foo_r118_024.string_access) 0x635038 Notice that printing the entire array works: (gdb) print Aos $1 = (0x635018, 0x635038) The problem was located in ada_value_print function and due to the fact that the value_type used in this function was based on value_enclosing_type rather than value_type itself. In our example, the difference between the value_type and the value_enclosing_type of the value is that the value_type contains an additional typedef layer which is not present in the value_enclosing_type. This typedef layer is GNAT's way to specify that the element is, at the source level, an access to the unconstrained array, rather than the unconstrained array. Moreover, the value_enclosing_type is not really needed in that case and the value_type can be used instead in this function, and this patch fixes this. gdb/ChangeLog: * ada-valprint.c (ada_value_print): Use type instead of enclosing type. testsuite/ChangeLog: * gdb.ada/access_to_unbounded_array.exp: New testcase. * gdb.ada/access_to_unbounded_array/foo.adb: New file. * gdb.ada/access_to_unbounded_array/pack.adb: New file. * gdb.ada/access_to_unbounded_array/pack.ads: New file. Tested: x86_64-linux
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/ada-valprint.c2
-rw-r--r--gdb/testsuite/ChangeLog7
-rw-r--r--gdb/testsuite/gdb.ada/access_to_unbounded_array.exp30
-rw-r--r--gdb/testsuite/gdb.ada/access_to_unbounded_array/foo.adb24
-rw-r--r--gdb/testsuite/gdb.ada/access_to_unbounded_array/pack.adb23
-rw-r--r--gdb/testsuite/gdb.ada/access_to_unbounded_array/pack.ads19
7 files changed, 109 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 40b7978..524d218 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2018-09-10 Xavier Roirand <roirand@adacore.com>
+ * ada-valprint.c (ada_value_print): Use type instead of
+ enclosing type.
+
+2018-09-10 Xavier Roirand <roirand@adacore.com>
+
* ada-lang.c (ada_value_subscript): Handle case when parameter is
an array of access to unconstrained array.
diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
index a486919..af289e2 100644
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -1224,7 +1224,7 @@ ada_value_print (struct value *val0, struct ui_file *stream,
{
struct value *val = ada_to_fixed_value (val0);
CORE_ADDR address = value_address (val);
- struct type *type = ada_check_typedef (value_enclosing_type (val));
+ struct type *type = ada_check_typedef (value_type (val));
struct value_print_options opts;
/* If it is a pointer, indicate what it points to. */
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8c47e86..bad86cf 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,12 @@
2018-09-10 Xavier Roirand <roirand@adacore.com>
+ * gdb.ada/access_to_unbounded_array.exp: New testcase.
+ * gdb.ada/access_to_unbounded_array/foo.adb: New file.
+ * gdb.ada/access_to_unbounded_array/pack.adb: New file.
+ * gdb.ada/access_to_unbounded_array/pack.ads: New file.
+
+2018-09-10 Xavier Roirand <roirand@adacore.com>
+
* gdb.ada/mi_string_access.exp: New testcase.
* gdb.ada/mi_string_access/bar.adb: New file.
* gdb.ada/mi_string_access/pck.adb: New file.
diff --git a/gdb/testsuite/gdb.ada/access_to_unbounded_array.exp b/gdb/testsuite/gdb.ada/access_to_unbounded_array.exp
new file mode 100644
index 0000000..3a22d32
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/access_to_unbounded_array.exp
@@ -0,0 +1,30 @@
+# Copyright 2018 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/>.
+
+load_lib "ada.exp"
+
+standard_ada_testfile foo
+
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+ return -1
+}
+
+clean_restart ${testfile}
+
+set bp_location [gdb_get_line_number "BREAK" ${testdir}/foo.adb]
+runto "foo.adb:$bp_location"
+
+gdb_test "print Aos(1)" " = \\(foo.string_access\\) $hex"
+gdb_test "print Aos(2)" " = \\(foo.string_access\\) $hex"
diff --git a/gdb/testsuite/gdb.ada/access_to_unbounded_array/foo.adb b/gdb/testsuite/gdb.ada/access_to_unbounded_array/foo.adb
new file mode 100644
index 0000000..b0804c0
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/access_to_unbounded_array/foo.adb
@@ -0,0 +1,24 @@
+-- Copyright 2018 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/>.
+
+with Pack; use Pack;
+
+procedure Foo is
+ type String_Access is access String;
+ type Array_Of_String is array (1 .. 2) of String_Access;
+ Aos : Array_Of_String := (new String'("ab"), new String'("cd"));
+begin
+ Do_Nothing (Aos'Address); -- BREAK
+end Foo;
diff --git a/gdb/testsuite/gdb.ada/access_to_unbounded_array/pack.adb b/gdb/testsuite/gdb.ada/access_to_unbounded_array/pack.adb
new file mode 100644
index 0000000..b42e981
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/access_to_unbounded_array/pack.adb
@@ -0,0 +1,23 @@
+-- Copyright 2018 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/>.
+
+package body Pack is
+
+ procedure Do_Nothing (A : System.Address) is
+ begin
+ null;
+ end Do_Nothing;
+
+end Pack;
diff --git a/gdb/testsuite/gdb.ada/access_to_unbounded_array/pack.ads b/gdb/testsuite/gdb.ada/access_to_unbounded_array/pack.ads
new file mode 100644
index 0000000..400c623
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/access_to_unbounded_array/pack.ads
@@ -0,0 +1,19 @@
+-- Copyright 2018 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/>.
+
+with System;
+package Pack is
+ procedure Do_Nothing (A : System.Address);
+end Pack;