This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[patch] Fix `return' of long/long-long results with no debuginfo
- From: Jan Kratochvil <jan dot kratochvil at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Wed, 11 Feb 2009 20:45:11 +0100
- Subject: [patch] Fix `return' of long/long-long results with no debuginfo
Hi,
the command `return' assumes `int' result when the current function has no
debug info. This assumption breaks for example `void *' return on x86_64.
Original bugreport: https://bugzilla.redhat.com/show_bug.cgi?id=365111
Regression-tested on x86_64-unknown-linux-gnu.
This testcase also covers the previous fix of the `return' crash:
http://sourceware.org/ml/gdb-patches/2009-01/msg00213.html
Thanks,
Jan
gdb/
2009-02-11 Jan Kratochvil <jan.kratochvil@redhat.com>
* stack.c (return_command): Default to the builtin_long_long type now.
gdb/testsuite/
2009-02-11 Jan Kratochvil <jan.kratochvil@redhat.com>
* gdb.base/return-nodebug.exp, gdb.base/return-nodebug.c: New.
--- gdb/stack.c 11 Feb 2009 16:07:28 -0000 1.185
+++ gdb/stack.c 11 Feb 2009 19:42:10 -0000
@@ -1807,7 +1807,8 @@ return_command (char *retval_exp, int fr
if (thisfun != NULL)
return_type = TYPE_TARGET_TYPE (SYMBOL_TYPE (thisfun));
if (return_type == NULL)
- return_type = builtin_type (get_frame_arch (thisframe))->builtin_int;
+ return_type
+ = builtin_type (get_frame_arch (thisframe))->builtin_long_long;
CHECK_TYPEDEF (return_type);
return_value = value_cast (return_type, return_value);
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gdb/testsuite/gdb.base/return-nodebug.c 11 Feb 2009 19:42:12 -0000
@@ -0,0 +1,40 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2009 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/>. */
+
+#include <stdio.h>
+
+static TYPE
+func (void)
+{
+ return (TYPE) -1;
+}
+
+static void
+marker (void)
+{
+}
+
+int
+main (void)
+{
+ printf ("result=" FORMAT "\n", CAST func ());
+
+ /* Cannot `next' with no debug info. */
+ marker ();
+
+ return 0;
+}
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gdb/testsuite/gdb.base/return-nodebug.exp 11 Feb 2009 19:42:12 -0000
@@ -0,0 +1,52 @@
+# Copyright (C) 2009 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/>.
+
+proc do_test {typenospace} {
+ global pf_prefix
+ set old_prefix $pf_prefix
+ lappend pf_prefix "$typenospace:"
+
+ if {[runto "func"]} {
+ # Test return from a function with no debug info (symbol; still it may
+ # have a minimal-symbol) if it does not crash.
+ gdb_test "return -1" "#0 .* main \\(.*" \
+ "return from function with no debug info" \
+ "Make selected stack frame return now\\? \\(y or n\\) " "y"
+
+ # And if it returned the full width of the result.
+ gdb_test "adv marker" "\r\nresult=-1\r\n.* in marker \\(.*" \
+ "full width of the returned result"
+ }
+
+ set pf_prefix $old_prefix
+}
+
+foreach case {{{char} %d (int)} \
+ {{short} %d (int)} \
+ {{int} %d} \
+ {{long} %ld} \
+ {{long long} %lld}} {
+ set type [lindex $case 0]
+ set format [lindex $case 1]
+ set cast [lindex $case 2]
+
+ set typeesc [string map {{ } {\ }} $type]
+ set typenospace [string map {{ } -} $type]
+
+ if {[prepare_for_testing return-nodebug.exp "return-nodebug-$typenospace" "return-nodebug.c" \
+ [list "additional_flags=-DFORMAT=\"$format\" -DTYPE=$typeesc -DCAST=$cast"]] == 0} {
+ do_test $typenospace
+ }
+}