Do not consider reference types as dynamic
Commit Message
Joel,
On 03/23/2015 02:36 PM, Joel Brobecker wrote:
> If it cannot pass without your GCC patch, let's add a setup_xfail.
Done.
> Mostly OK - a couple of minor comments below.
> [...]
> If the test "label" (3rd argument) is the same as the command being
> sent, you do not need to explicitly specify it. So, the following
> is equivalent to your version:
>
> gdb_test "p get (\"Hello world!\")" \
> "= \\(n => 12, s => \"Hello world!\"\\)"
>
>> +gdb_test "ptype get (\"Hello world!\")" \
>> + [multi_line "type = <ref> record" \
>> + " n: natural;" \
>> + " s: access array \\(1 \\.\\. n\\) of character;" \
>> + "end record"] \
>> + "ptype get (\"Hello world!\")"
>
> Same here.
Fixed both.
>> +++ b/gdb/testsuite/gdb.ada/funcall_ref/foo.adb
>> @@ -0,0 +1,19 @@
>> +procedure Foo is
>
> Missing copyright header.
Likewise.
Here's the updated patch. Thank you for reviewing!
From 5c456519c3651360120739d1ee6cf01d4a61adac Mon Sep 17 00:00:00 2001
From: Pierre-Marie de Rodat <derodat@adacore.com>
Date: Tue, 10 Mar 2015 09:18:45 +0100
Subject: [PATCH] Do not consider reference types as dynamic
Even when referenced types are dynamic, the corresponding referencing
type should not be considered as dynamic: it's only a pointer. This
prevents reference type for values not in memory to be resolved.
gdb/ChangeLog:
2015-03-23 Pierre-Marie de Rodat <derodat@adacore.com>
* gdbtypes.c (is_dynamic_type_internal): Remove special handling
of TYPE_CODE_REF types so that they are not considered as
dynamic depending on the referenced type.
gdb/testsuite/ChangeLog:
2015-03-23 Pierre-Marie de Rodat <derodat@adacore.com>
* gdb.ada/funcall_ref.exp: New file.
* gdb.ada/funcall_ref/foo.adb: New file.
---
gdb/gdbtypes.c | 4 ---
gdb/testsuite/gdb.ada/funcall_ref.exp | 44 +++++++++++++++++++++++++++++++
gdb/testsuite/gdb.ada/funcall_ref/foo.adb | 34 ++++++++++++++++++++++++
3 files changed, 78 insertions(+), 4 deletions(-)
create mode 100644 gdb/testsuite/gdb.ada/funcall_ref.exp
create mode 100644 gdb/testsuite/gdb.ada/funcall_ref/foo.adb
@@ -1752,10 +1752,6 @@ is_dynamic_type_internal (struct type *type, int top_level)
{
type = check_typedef (type);
- /* We only want to recognize references at the outermost level. */
- if (top_level && TYPE_CODE (type) == TYPE_CODE_REF)
- type = check_typedef (TYPE_TARGET_TYPE (type));
-
/* Types that have a dynamic TYPE_DATA_LOCATION are considered
dynamic, even if the type itself is statically defined.
From a user's point of view, this may appear counter-intuitive;
new file mode 100644
@@ -0,0 +1,44 @@
+# Copyright 2008-2015 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 "STOP" ${testdir}/foo.adb]
+runto "foo.adb:$bp_location"
+
+# Test printing and type-printing of a discriminated record that a function
+# returns by reference.
+
+# Currently, GCC describes such functions as returning pointers (instead of
+# references).
+setup_xfail *-*-*
+gdb_test "p get (\"Hello world!\")" \
+ "= \\(n => 12, s => \"Hello world!\"\\)" \
+
+setup_xfail *-*-*
+gdb_test "ptype get (\"Hello world!\")" \
+ [multi_line "type = <ref> record" \
+ " n: natural;" \
+ " s: access array \\(1 \\.\\. n\\) of character;" \
+ "end record"] \
new file mode 100644
@@ -0,0 +1,34 @@
+-- Copyright 2008-2015 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/>.
+
+procedure Foo is
+ type Bar (N : Natural) is record
+ S : String (1 .. N);
+ end record;
+
+ function Get (S : String) return Bar is
+ begin
+ return (N => S'Length, S => S);
+ end Get;
+
+ procedure Do_Nothing (B : Bar) is
+ begin
+ null;
+ end Do_Nothing;
+
+ B : Bar := Get ("Foo");
+begin
+ Do_Nothing (B); -- STOP
+end Foo;
--
2.3.4