From: Sergio Durigan Junior <sergiodj@redhat.com>
Date: Thu, 4 Sep 2014 14:28:31 +0000 (-0400)
Subject: Fix PR fortran/17237: bug in f-valprint.c
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eb0b04635f2f57506ab4365b32a6fc0b62920d2f;p=binutils-gdb.git

Fix PR fortran/17237: bug in f-valprint.c

This commit fixes the PR mentioned in $subject.  It is about a set but
unused variable that refers to the output format of integer values
printed in Fortran.

This was probably a thinko (like most set-but-unused-vars), but it
could cause an internal error depending on the scenario.  I am sending
a testcase which triggers this error as well.

gdb/ChangeLog:
2014-09-04  Sergio Durigan Junior  <sergiodj@redhat.com>

	PR fortran/17237
	* f-valprint.c (f_val_print): Specify the correct print option to
	use when printing integer values.

gdb/testsuite/ChangeLog:
2014-09-04  Sergio Durigan Junior  <sergiodj@redhat.com>

	PR fortran/17237
	* gdb.fortran/print-formatted.exp: New file.
	* gdb.fortran/print-formatted.f90: Likewise.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 62316bbd819..201a8c57288 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-04  Sergio Durigan Junior  <sergiodj@redhat.com>
+
+	PR fortran/17237
+	* f-valprint.c (f_val_print): Specify the correct print option to
+	use when printing integer values.
+
 2014-09-04  Gary Benson  <gbenson@redhat.com>
 
 	* x86-linux-nat.c (x86_linux_dr_get, x86_linux_dr_set):
diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index c7581a8928a..9a43cf371bc 100644
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -349,7 +349,7 @@ f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
 	  opts.format = (options->format ? options->format
 			 : options->output_format);
 	  val_print_scalar_formatted (type, valaddr, embedded_offset,
-				      original_value, options, 0, stream);
+				      original_value, &opts, 0, stream);
 	}
       else
 	{
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 10d27b3c0a1..50c69aed3dc 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-04  Sergio Durigan Junior  <sergiodj@redhat.com>
+
+	PR fortran/17237
+	* gdb.fortran/print-formatted.exp: New file.
+	* gdb.fortran/print-formatted.f90: Likewise.
+
 2014-09-03  Sasha Smundak  <asmundak@google.com>
 
 	* gdb.python/py-frame.exp: Test Frame.read_register.
diff --git a/gdb/testsuite/gdb.fortran/print-formatted.exp b/gdb/testsuite/gdb.fortran/print-formatted.exp
new file mode 100644
index 00000000000..b0f6d36be0a
--- /dev/null
+++ b/gdb/testsuite/gdb.fortran/print-formatted.exp
@@ -0,0 +1,39 @@
+# Copyright (C) 2014 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 "fortran.exp"
+
+if { [skip_fortran_tests] } {
+    continue
+}
+
+standard_testfile .f90
+
+if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}] } {
+    return -1
+}
+
+if { ![runto MAIN__] } {
+    fail "runto MAIN__"
+    return -1
+}
+
+gdb_test "next" ".*" "go to the end of the program"
+
+gdb_test "set output-radix 16" \
+    "Output radix now set to decimal 16, hex 10, octal 20." \
+    "setting the output-radix to 16"
+
+gdb_test "print ii" " = 0xa" "print ii in hex"
diff --git a/gdb/testsuite/gdb.fortran/print-formatted.f90 b/gdb/testsuite/gdb.fortran/print-formatted.f90
new file mode 100644
index 00000000000..1c6c8d40af6
--- /dev/null
+++ b/gdb/testsuite/gdb.fortran/print-formatted.f90
@@ -0,0 +1,20 @@
+! Copyright 2014 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/>.
+
+program printformatted
+  integer :: ii
+
+  ii = 10
+end program printformatted