diff options
author | Joel Brobecker <brobecker@gnat.com> | 2012-10-24 18:14:23 +0000 |
---|---|---|
committer | Joel Brobecker <brobecker@gnat.com> | 2012-10-24 18:14:23 +0000 |
commit | d99dcf51e1ace49b2e69fa72d2f9d0a048faa0de (patch) | |
tree | c45b465502ca40b2924cdb8d64638e44298e6b9e /gdb/testsuite/gdb.ada | |
parent | 3256027470cc5339e32600cd0d5900f3ce3344e7 (diff) | |
download | binutils-d99dcf51e1ace49b2e69fa72d2f9d0a048faa0de.zip binutils-d99dcf51e1ace49b2e69fa72d2f9d0a048faa0de.tar.gz binutils-d99dcf51e1ace49b2e69fa72d2f9d0a048faa0de.tar.bz2 |
[Ada] Allow assignment to wide string.
Given the following variable declaration...
Www : Wide_String := "12345";
... this patch allows the following assignment to work:
(gdb) set variable www := "qwert"
Without this patch, the debugger rejects the assignment because
the size of the array elements are different:
(gdb) set www := "asdfg"
Incompatible types in assignment
(on the lhs, we have an array of 2-bytes elements, and on the rhs,
we have a standard 1-byte string).
gdb/ChangeLog:
* ada-lang.c (ada_same_array_size_p): New function.
(ada_promote_array_of_integrals): New function.
(coerce_for_assign): Add handling of arrays where the elements
are integrals of a smaller size than the size of the target
array element type.
gdb/testsuite/ChangeLog:
* gdb.ada/set_wstr: New testcase.
Diffstat (limited to 'gdb/testsuite/gdb.ada')
-rw-r--r-- | gdb/testsuite/gdb.ada/set_wstr.exp | 74 | ||||
-rw-r--r-- | gdb/testsuite/gdb.ada/set_wstr/a.adb | 26 | ||||
-rw-r--r-- | gdb/testsuite/gdb.ada/set_wstr/pck.adb | 21 | ||||
-rw-r--r-- | gdb/testsuite/gdb.ada/set_wstr/pck.ads | 19 |
4 files changed, 140 insertions, 0 deletions
diff --git a/gdb/testsuite/gdb.ada/set_wstr.exp b/gdb/testsuite/gdb.ada/set_wstr.exp new file mode 100644 index 0000000..0a257be --- /dev/null +++ b/gdb/testsuite/gdb.ada/set_wstr.exp @@ -0,0 +1,74 @@ +# Copyright 2012 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 a + +if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { + return -1 +} + +clean_restart ${testfile} + +set bp_location [gdb_get_line_number "STOP" ${testdir}/a.adb] +if ![runto "a.adb:$bp_location" ] then { + perror "Couldn't run ${testfile}" + return +} + +# Verify that assigning to Nnn (a basic string) works... + +gdb_test "print nnn" \ + "= \"12345\"" \ + "print nnn before assignment" + +gdb_test_no_output "set variable nnn := \"qcyom\"" + +gdb_test "print nnn" \ + "= \"qcyom\"" \ + "print nnn after assignment" + +# Same with Www (a wide string)... + +gdb_test "print www" \ + "= \"12345\"" \ + "print www before assignment" + +gdb_test_no_output "set variable www := \"zenrk\"" + +gdb_test "print www" \ + "= \"zenrk\"" \ + "print www after assignment" + +# Same with Rws (a wide wide string)... + +gdb_test "print rws" \ + "= \"12345\"" \ + "print rws before assignment" + +gdb_test_no_output "set variable rws := \"ndhci\"" + +gdb_test "print rws" \ + "= \"ndhci\"" \ + "print rws after assignment" + +# Also, check that GDB doesn't get tricked if we assign to Www a +# string twice the length of Www. The debugger should reject the +# assignment, because the array lengths are different (the debugger +# used to get tricked because the array size was the same). + +gdb_test "set variable www := \"1#2#3#4#5#\"" \ + "cannot assign arrays of different length" diff --git a/gdb/testsuite/gdb.ada/set_wstr/a.adb b/gdb/testsuite/gdb.ada/set_wstr/a.adb new file mode 100644 index 0000000..e1b9bd8 --- /dev/null +++ b/gdb/testsuite/gdb.ada/set_wstr/a.adb @@ -0,0 +1,26 @@ +-- Copyright 2012 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 A is + Nnn : String := "12345"; + Www : Wide_String := "12345"; + Rws : Wide_Wide_String := "12345"; +begin + Do_Nothing (Nnn'Address); -- STOP + Do_Nothing (Www'Address); + Do_Nothing (Rws'Address); +end A; diff --git a/gdb/testsuite/gdb.ada/set_wstr/pck.adb b/gdb/testsuite/gdb.ada/set_wstr/pck.adb new file mode 100644 index 0000000..1f7d45c --- /dev/null +++ b/gdb/testsuite/gdb.ada/set_wstr/pck.adb @@ -0,0 +1,21 @@ +-- Copyright 2012 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 + procedure Do_Nothing (A : System.Address) is + begin + null; + end Do_Nothing; +end Pck; diff --git a/gdb/testsuite/gdb.ada/set_wstr/pck.ads b/gdb/testsuite/gdb.ada/set_wstr/pck.ads new file mode 100644 index 0000000..c20c0d8 --- /dev/null +++ b/gdb/testsuite/gdb.ada/set_wstr/pck.ads @@ -0,0 +1,19 @@ +-- Copyright 2012 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 + procedure Do_Nothing (A : System.Address); +end Pck; |