diff options
| -rw-r--r-- | gdb/dwarf2/read.c | 24 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.opt/fortran-string.exp | 38 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.opt/fortran-string.f90 | 27 |
3 files changed, 85 insertions, 4 deletions
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index bd07546..af184d4 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -18468,14 +18468,30 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die, } else if (attr->form_is_constant ()) prop->set_const_val (attr->constant_value (0)); - else + else if (attr->form_is_section_offset ()) { - dwarf2_invalid_attrib_class_complaint (dwarf_form_name (attr->form), - dwarf2_name (die, cu)); - return 0; + switch (attr->name) + { + case DW_AT_string_length: + baton = XOBNEW (obstack, struct dwarf2_property_baton); + baton->property_type = default_type; + fill_in_loclist_baton (cu, &baton->loclist, attr); + prop->set_loclist (baton); + gdb_assert (prop->baton () != NULL); + break; + default: + goto invalid; + } } + else + goto invalid; return 1; + + invalid: + dwarf2_invalid_attrib_class_complaint (dwarf_form_name (attr->form), + dwarf2_name (die, cu)); + return 0; } /* See read.h. */ diff --git a/gdb/testsuite/gdb.opt/fortran-string.exp b/gdb/testsuite/gdb.opt/fortran-string.exp new file mode 100644 index 0000000..9bf6269 --- /dev/null +++ b/gdb/testsuite/gdb.opt/fortran-string.exp @@ -0,0 +1,38 @@ +# Copyright 2009-2021 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/> . + +# Test GDB can cope with Fortran strings having their length present in a CPU +# register. With -O0 the string length is passed on the stack. To make this +# test meaningful the follow assertion should pass. It is not being checked +# here as the "_s" symbol is compiler dependent: +# (gdb) info address _s +# Symbol "_s" is a variable in register XX. + +standard_testfile .f90 + +if { [prepare_for_testing "prepare for testing" ${testfile} ${srcfile} \ + {debug f90 additional_flags=-O1}] } { + return -1 +} + +if ![runto f] then { + perror "couldn't run to f" + continue +} + +gdb_test_no_output "set print frame-arguments all" +gdb_test "frame" ".*s='foo'.*" +gdb_test "ptype s" "type = character \\(3\\)" +gdb_test "p s" "\\$\[0-9\]* = 'foo'" diff --git a/gdb/testsuite/gdb.opt/fortran-string.f90 b/gdb/testsuite/gdb.opt/fortran-string.f90 new file mode 100644 index 0000000..71b6bae --- /dev/null +++ b/gdb/testsuite/gdb.opt/fortran-string.f90 @@ -0,0 +1,27 @@ +! Copyright 2009-2021 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/>. + +subroutine f(s) + character*(*) s + print *, s + s(1:3) = 'oof' + print *, s +end subroutine f + +program main + character*3 s; + s = 'foo' + call f (s) +end program main |