From patchwork Tue Sep 2 18:01:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Durigan Junior X-Patchwork-Id: 2630 Received: (qmail 27319 invoked by alias); 2 Sep 2014 18:01:57 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 27300 invoked by uid 89); 2 Sep 2014 18:01:53 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.1 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 02 Sep 2014 18:01:50 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s82I1mJD003136 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 2 Sep 2014 14:01:49 -0400 Received: from psique.yyz.redhat.com (dhcp-10-15-16-169.yyz.redhat.com [10.15.16.169]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s82I1mZN018138; Tue, 2 Sep 2014 14:01:48 -0400 From: Sergio Durigan Junior To: GDB Patches Cc: Sergio Durigan Junior Subject: [PATCH] Fix PR fortran/17237: bug in f-valprint.c Date: Tue, 2 Sep 2014 14:01:42 -0400 Message-Id: <1409680902-22975-1-git-send-email-sergiodj@redhat.com> X-IsSubscribed: yes 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-02 Sergio Durigan Junior 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-02 Sergio Durigan Junior PR fortran/17237 * gdb.fortran/print-formatted.exp: New file. * gdb.fortran/print-formatted.f90: Likewise. --- gdb/f-valprint.c | 2 +- gdb/testsuite/gdb.fortran/print-formatted.exp | 39 +++++++++++++++++++++++++++ gdb/testsuite/gdb.fortran/print-formatted.f90 | 20 ++++++++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 gdb/testsuite/gdb.fortran/print-formatted.exp create mode 100644 gdb/testsuite/gdb.fortran/print-formatted.f90 diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c index c7581a8..9a43cf3 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/gdb.fortran/print-formatted.exp b/gdb/testsuite/gdb.fortran/print-formatted.exp new file mode 100644 index 0000000..f4ecd5e --- /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 . + +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" diff --git a/gdb/testsuite/gdb.fortran/print-formatted.f90 b/gdb/testsuite/gdb.fortran/print-formatted.f90 new file mode 100644 index 0000000..1c6c8d4 --- /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 . + +program printformatted + integer :: ii + + ii = 10 +end program printformatted