Skip to content

Commit 2880242

Browse files
shtiekshtiek
committed
Allow really large fortran array bounds: fortran type/value printers
This is the fortran part of the patch, including tests, which are essentially unchanged from Siddhesh's original 2012 submission: https://sourceware.org/ml/gdb-patches/2012-08/msg00562.html There is, however, one large departure. In the above thread, Jan pointed out problems with GCC debuginfo for -m32 builds (filed usptream as gcc/54934). After investigating the issue, I am dropping the hand-tweaked assembler source file to workaround this case. While I would normally do something to accommodate this, in this case, given the ubiquity of 64-bit systems today (where the tests pass) and the apparent lack of urgency on the compiler side (by users), I don't think the additional complexity and maintenance costs are worth it. It will be very routinely tested on 64-bit systems. [For example, at Red Hat, we always test -m64 and -m32 configurations for all GDB releases.] gdb/ChangeLog: From Siddhesh Poyarekar: * f-lang.h (f77_get_upperbound): Return LONGEST. (f77_get_lowerbound): Likewise. * f-typeprint.c (f_type_print_varspec_suffix): Expand UPPER_BOUND and LOWER_BOUND to LONGEST. Use plongest to format print them. (f_type_print_base): Expand UPPER_BOUND to LONGEST. Use plongest to format print it. * f-valprint.c (f77_get_lowerbound): Return LONGEST. (f77_get_upperbound): Likewise. (f77_get_dynamic_length_of_aggregate): Expand UPPER_BOUND, LOWER_BOUND to LONGEST. (f77_create_arrayprint_offset_tbl): Likewise. gdb/testsuite/ChangeLog: * gdb.fortran/array-bounds.exp: New file. * gdb.fortran/array-bounds.f90: New file.
1 parent cc1defb commit 2880242

File tree

7 files changed

+110
-13
lines changed

7 files changed

+110
-13
lines changed

‎gdb/ChangeLog‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
2019-03-29 Keith Seitz <keiths@redhat.com>
2+
3+
From Siddhesh Poyarekar:
4+
* f-lang.h (f77_get_upperbound): Return LONGEST.
5+
(f77_get_lowerbound): Likewise.
6+
* f-typeprint.c (f_type_print_varspec_suffix): Expand
7+
UPPER_BOUND and LOWER_BOUND to LONGEST. Use plongest to format
8+
print them.
9+
(f_type_print_base): Expand UPPER_BOUND to LONGEST. Use
10+
plongest to format print it.
11+
* f-valprint.c (f77_get_lowerbound): Return LONGEST.
12+
(f77_get_upperbound): Likewise.
13+
(f77_get_dynamic_length_of_aggregate): Expand UPPER_BOUND,
14+
LOWER_BOUND to LONGEST.
15+
(f77_create_arrayprint_offset_tbl): Likewise.
16+
117
2019-03-29 Keith Seitz <keiths@redhat.com>
218

319
* ada-lang.c (ada_template_to_fixed_record_type_1): Use

‎gdb/f-lang.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ struct common_block
5050
struct symbol *contents[1];
5151
};
5252

53-
extern int f77_get_upperbound (struct type *);
53+
extern LONGEST f77_get_upperbound (struct type *);
5454

55-
extern int f77_get_lowerbound (struct type *);
55+
extern LONGEST f77_get_lowerbound (struct type *);
5656

5757
extern void f77_get_dynamic_array_length (struct type *);
5858

‎gdb/f-typeprint.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,6 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
161161
int show, int passed_a_ptr, int demangled_args,
162162
int arrayprint_recurse_level)
163163
{
164-
int upper_bound, lower_bound;
165-
166164
/* No static variables are permitted as an error call may occur during
167165
execution of this function. */
168166

@@ -192,9 +190,10 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
192190
f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0,
193191
0, 0, arrayprint_recurse_level);
194192

195-
lower_bound = f77_get_lowerbound (type);
193+
LONGEST lower_bound = f77_get_lowerbound (type);
194+
196195
if (lower_bound != 1) /* Not the default. */
197-
fprintf_filtered (stream, "%d:", lower_bound);
196+
fprintf_filtered (stream, "%s:", plongest (lower_bound));
198197

199198
/* Make sure that, if we have an assumed size array, we
200199
print out a warning and print the upperbound as '*'. */
@@ -203,8 +202,9 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
203202
fprintf_filtered (stream, "*");
204203
else
205204
{
206-
upper_bound = f77_get_upperbound (type);
207-
fprintf_filtered (stream, "%d", upper_bound);
205+
LONGEST upper_bound = f77_get_upperbound (type);
206+
207+
fputs_filtered (plongest (upper_bound), stream);
208208
}
209209

210210
if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_ARRAY)
@@ -273,7 +273,6 @@ void
273273
f_type_print_base (struct type *type, struct ui_file *stream, int show,
274274
int level)
275275
{
276-
int upper_bound;
277276
int index;
278277

279278
QUIT;
@@ -364,8 +363,9 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show,
364363
fprintfi_filtered (level, stream, "character*(*)");
365364
else
366365
{
367-
upper_bound = f77_get_upperbound (type);
368-
fprintf_filtered (stream, "character*%d", upper_bound);
366+
LONGEST upper_bound = f77_get_upperbound (type);
367+
368+
fprintf_filtered (stream, "character*%s", pulongest (upper_bound));
369369
}
370370
break;
371371

‎gdb/f-valprint.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ int f77_array_offset_tbl[MAX_FORTRAN_DIMS + 1][2];
4141
/* Array which holds offsets to be applied to get a row's elements
4242
for a given array. Array also holds the size of each subarray. */
4343

44-
int
44+
LONGEST
4545
f77_get_lowerbound (struct type *type)
4646
{
4747
if (TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED (type))
@@ -50,7 +50,7 @@ f77_get_lowerbound (struct type *type)
5050
return TYPE_ARRAY_LOWER_BOUND_VALUE (type);
5151
}
5252

53-
int
53+
LONGEST
5454
f77_get_upperbound (struct type *type)
5555
{
5656
if (TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (type))

‎gdb/testsuite/ChangeLog‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2019-03-29 Keith Seitz <keiths@redhat.com>
2+
3+
* gdb.fortran/array-bounds.exp: New file.
4+
* gdb.fortran/array-bounds.f90: New file.
5+
16
2019-03-28 Philippe Waroquiers <philippe.waroquiers@skynet.be>
27

38
* gdb.multi/multi-term-settings.c (main): Increase alarm timer.

‎gdb/testsuite/gdb.fortran/array-bounds.exp‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# Copyright 2012-2019 Free Software Foundation, Inc.
2+
3+
# This program is free software; you can redistribute it and/or modify
4+
# it under the terms of the GNU General Public License as published by
5+
# the Free Software Foundation; either version 3 of the License, or
6+
# (at your option) any later version.
7+
#
8+
# This program is distributed in the hope that it will be useful,
9+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
# GNU General Public License for more details.
12+
#
13+
# You should have received a copy of the GNU General Public License
14+
# along with this program. If not, see <http://www.gnu.org/licenses/>.
15+
16+
# This file is part of the gdb testsuite. It contains test to ensure that
17+
# array bounds accept LONGEST.
18+
19+
if { [skip_fortran_tests] } { return -1 }
20+
21+
set testfile "array-bounds"
22+
standard_testfile .f90
23+
24+
if {[prepare_for_testing $testfile.exp $testfile $srcfile {f90 debug}]} {
25+
return -1
26+
}
27+
28+
if {![runto MAIN__]} {
29+
perror "Could not run to breakpoint `MAIN__'."
30+
continue
31+
}
32+
33+
# Convenience proc to setup for KFAIL
34+
proc kfail_if {exp bugid triplet} {
35+
if {$exp} {
36+
setup_kfail $bugid $triplet
37+
}
38+
}
39+
40+
# GCC outputs incorrect range debug info for -m32.
41+
set expect_fail false
42+
if {[is_ilp32_target] && ([istarget "i\[34567\]86-*-linux*"]
43+
|| [istarget "x86_64-*-linux*"])} {
44+
set expect_fail true
45+
}
46+
47+
kfail_if $expect_fail "gcc/54934" "*-*-*"
48+
gdb_test "print &foo" {.*\(4294967296:4294967297\).*}
49+
kfail_if $expect_fail "gcc/54934" "*-*-*"
50+
gdb_test "print &bar" {.*\(-4294967297:-4294967296\).*}

‎gdb/testsuite/gdb.fortran/array-bounds.f90‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
! Copyright 2012-2019 Free Software Foundation, Inc.
2+
3+
! This program is free software; you can redistribute it and/or modify
4+
! it under the terms of the GNU General Public License as published by
5+
! the Free Software Foundation; either version 3 of the License, or
6+
! (at your option) any later version.
7+
!
8+
! This program is distributed in the hope that it will be useful,
9+
! but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
! GNU General Public License for more details.
12+
!
13+
! You should have received a copy of the GNU General Public License
14+
! along with this program. If not, see <http://www.gnu.org/licenses/>.
15+
16+
dimension foo(4294967296_8:4294967297_8)
17+
dimension bar(-4294967297_8:-4294967296_8)
18+
integer(8) :: lb, ub
19+
bar = 42
20+
foo = bar
21+
lb = lbound (foo, dim = 1, kind = 8)
22+
ub = ubound (foo, dim = 1, kind = 8)
23+
print *, 'bounds of foo - ', lb, ':', ub
24+
stop
25+
end
26+

0 commit comments

Comments
 (0)