* [PATCH] Preserve name of range types
@ 2023-03-20 16:17 Tom Tromey
2023-03-23 16:19 ` Bruno Larsen
0 siblings, 1 reply; 3+ messages in thread
From: Tom Tromey @ 2023-03-20 16:17 UTC (permalink / raw)
To: gdb-patches; +Cc: Tom Tromey
The type-allocation patches introduced a small regression that was
picked up by the AdaCore internal test suite. Previously, the name of
a range type was preserved by resolve_dynamic_range, but now it is
not. This patch changes this code to preserve the name.
---
gdb/gdbtypes.c | 1 +
gdb/testsuite/gdb.ada/dyn-range.exp | 33 +++++++++++++++++++++++++
gdb/testsuite/gdb.ada/dyn-range/dyn.adb | 24 ++++++++++++++++++
gdb/testsuite/gdb.ada/dyn-range/pck.adb | 26 +++++++++++++++++++
gdb/testsuite/gdb.ada/dyn-range/pck.ads | 20 +++++++++++++++
5 files changed, 104 insertions(+)
create mode 100644 gdb/testsuite/gdb.ada/dyn-range.exp
create mode 100644 gdb/testsuite/gdb.ada/dyn-range/dyn.adb
create mode 100644 gdb/testsuite/gdb.ada/dyn-range/pck.adb
create mode 100644 gdb/testsuite/gdb.ada/dyn-range/pck.ads
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index b25b0ce2e34..44b06921387 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -2230,6 +2230,7 @@ resolve_dynamic_range (struct type *dyn_range_type,
static_range_type = create_range_type_with_stride
(alloc, static_target_type,
&low_bound, &high_bound, bias, &stride, byte_stride_p);
+ static_range_type->set_name (dyn_range_type->name ());
static_range_type->bounds ()->flag_bound_evaluated = 1;
return static_range_type;
}
diff --git a/gdb/testsuite/gdb.ada/dyn-range.exp b/gdb/testsuite/gdb.ada/dyn-range.exp
new file mode 100644
index 00000000000..be217d15a61
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/dyn-range.exp
@@ -0,0 +1,33 @@
+# Copyright 2023 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"
+
+require allow_ada_tests
+
+standard_ada_testfile dyn
+
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
+ return -1
+}
+
+clean_restart ${testfile}
+
+set bp_location [gdb_get_line_number "STOP" ${testdir}/dyn.adb]
+if {![runto "dyn.adb:$bp_location"]} {
+ return -1
+}
+
+gdb_test "whatis d" "type = dyn.dyn_range"
diff --git a/gdb/testsuite/gdb.ada/dyn-range/dyn.adb b/gdb/testsuite/gdb.ada/dyn-range/dyn.adb
new file mode 100644
index 00000000000..d071bf92132
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/dyn-range/dyn.adb
@@ -0,0 +1,24 @@
+-- Copyright 2023 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 Pck; use Pck;
+
+procedure Dyn is
+ type Dyn_Range is new Integer range Ident (1) .. Ident (100);
+
+ D : Dyn_Range := 45;
+begin
+ Do_Nothing (D'Address); -- STOP
+end Dyn;
diff --git a/gdb/testsuite/gdb.ada/dyn-range/pck.adb b/gdb/testsuite/gdb.ada/dyn-range/pck.adb
new file mode 100644
index 00000000000..91fef4e5dff
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/dyn-range/pck.adb
@@ -0,0 +1,26 @@
+-- Copyright 2023 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 Pck is
+ function Ident (I : Integer) return Integer is
+ begin
+ return I;
+ end Ident;
+
+ procedure Do_Nothing (A : System.Address) is
+ begin
+ null;
+ end Do_Nothing;
+end Pck;
diff --git a/gdb/testsuite/gdb.ada/dyn-range/pck.ads b/gdb/testsuite/gdb.ada/dyn-range/pck.ads
new file mode 100644
index 00000000000..c96f9d4ab82
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/dyn-range/pck.ads
@@ -0,0 +1,20 @@
+-- Copyright 2023 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 Pck is
+ function Ident (I : Integer) return Integer;
+ procedure Do_Nothing (A : System.Address);
+end Pck;
--
2.39.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] Preserve name of range types
2023-03-20 16:17 [PATCH] Preserve name of range types Tom Tromey
@ 2023-03-23 16:19 ` Bruno Larsen
2023-03-24 16:20 ` Tom Tromey
0 siblings, 1 reply; 3+ messages in thread
From: Bruno Larsen @ 2023-03-23 16:19 UTC (permalink / raw)
To: Tom Tromey, gdb-patches
On 20/03/2023 17:17, Tom Tromey via Gdb-patches wrote:
> The type-allocation patches introduced a small regression that was
> picked up by the AdaCore internal test suite. Previously, the name of
> a range type was preserved by resolve_dynamic_range, but now it is
> not. This patch changes this code to preserve the name.
I can confirm that this fixes the new test case and doesn't introduce
any new regressions.
Reviewed-By: Bruno Larsen <blarsen@redhat.com>
--
Cheers,
Bruno
> ---
> gdb/gdbtypes.c | 1 +
> gdb/testsuite/gdb.ada/dyn-range.exp | 33 +++++++++++++++++++++++++
> gdb/testsuite/gdb.ada/dyn-range/dyn.adb | 24 ++++++++++++++++++
> gdb/testsuite/gdb.ada/dyn-range/pck.adb | 26 +++++++++++++++++++
> gdb/testsuite/gdb.ada/dyn-range/pck.ads | 20 +++++++++++++++
> 5 files changed, 104 insertions(+)
> create mode 100644 gdb/testsuite/gdb.ada/dyn-range.exp
> create mode 100644 gdb/testsuite/gdb.ada/dyn-range/dyn.adb
> create mode 100644 gdb/testsuite/gdb.ada/dyn-range/pck.adb
> create mode 100644 gdb/testsuite/gdb.ada/dyn-range/pck.ads
>
> diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
> index b25b0ce2e34..44b06921387 100644
> --- a/gdb/gdbtypes.c
> +++ b/gdb/gdbtypes.c
> @@ -2230,6 +2230,7 @@ resolve_dynamic_range (struct type *dyn_range_type,
> static_range_type = create_range_type_with_stride
> (alloc, static_target_type,
> &low_bound, &high_bound, bias, &stride, byte_stride_p);
> + static_range_type->set_name (dyn_range_type->name ());
> static_range_type->bounds ()->flag_bound_evaluated = 1;
> return static_range_type;
> }
> diff --git a/gdb/testsuite/gdb.ada/dyn-range.exp b/gdb/testsuite/gdb.ada/dyn-range.exp
> new file mode 100644
> index 00000000000..be217d15a61
> --- /dev/null
> +++ b/gdb/testsuite/gdb.ada/dyn-range.exp
> @@ -0,0 +1,33 @@
> +# Copyright 2023 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"
> +
> +require allow_ada_tests
> +
> +standard_ada_testfile dyn
> +
> +if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
> + return -1
> +}
> +
> +clean_restart ${testfile}
> +
> +set bp_location [gdb_get_line_number "STOP" ${testdir}/dyn.adb]
> +if {![runto "dyn.adb:$bp_location"]} {
> + return -1
> +}
> +
> +gdb_test "whatis d" "type = dyn.dyn_range"
> diff --git a/gdb/testsuite/gdb.ada/dyn-range/dyn.adb b/gdb/testsuite/gdb.ada/dyn-range/dyn.adb
> new file mode 100644
> index 00000000000..d071bf92132
> --- /dev/null
> +++ b/gdb/testsuite/gdb.ada/dyn-range/dyn.adb
> @@ -0,0 +1,24 @@
> +-- Copyright 2023 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 Pck; use Pck;
> +
> +procedure Dyn is
> + type Dyn_Range is new Integer range Ident (1) .. Ident (100);
> +
> + D : Dyn_Range := 45;
> +begin
> + Do_Nothing (D'Address); -- STOP
> +end Dyn;
> diff --git a/gdb/testsuite/gdb.ada/dyn-range/pck.adb b/gdb/testsuite/gdb.ada/dyn-range/pck.adb
> new file mode 100644
> index 00000000000..91fef4e5dff
> --- /dev/null
> +++ b/gdb/testsuite/gdb.ada/dyn-range/pck.adb
> @@ -0,0 +1,26 @@
> +-- Copyright 2023 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 Pck is
> + function Ident (I : Integer) return Integer is
> + begin
> + return I;
> + end Ident;
> +
> + procedure Do_Nothing (A : System.Address) is
> + begin
> + null;
> + end Do_Nothing;
> +end Pck;
> diff --git a/gdb/testsuite/gdb.ada/dyn-range/pck.ads b/gdb/testsuite/gdb.ada/dyn-range/pck.ads
> new file mode 100644
> index 00000000000..c96f9d4ab82
> --- /dev/null
> +++ b/gdb/testsuite/gdb.ada/dyn-range/pck.ads
> @@ -0,0 +1,20 @@
> +-- Copyright 2023 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 Pck is
> + function Ident (I : Integer) return Integer;
> + procedure Do_Nothing (A : System.Address);
> +end Pck;
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] Preserve name of range types
2023-03-23 16:19 ` Bruno Larsen
@ 2023-03-24 16:20 ` Tom Tromey
0 siblings, 0 replies; 3+ messages in thread
From: Tom Tromey @ 2023-03-24 16:20 UTC (permalink / raw)
To: Bruno Larsen; +Cc: Tom Tromey, gdb-patches
>> The type-allocation patches introduced a small regression that was
>> picked up by the AdaCore internal test suite. Previously, the name of
>> a range type was preserved by resolve_dynamic_range, but now it is
>> not. This patch changes this code to preserve the name.
Bruno> I can confirm that this fixes the new test case and doesn't introduce
Bruno> any new regressions.
Bruno> Reviewed-By: Bruno Larsen <blarsen@redhat.com>
Thanks, I'm going to check it in.
Tom
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-03-24 16:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-20 16:17 [PATCH] Preserve name of range types Tom Tromey
2023-03-23 16:19 ` Bruno Larsen
2023-03-24 16:20 ` Tom Tromey
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).