From: Bernhard Heckel <bernhard.heckel@intel.com>
To: qiyaoltc@gmail.com
Cc: gdb-patches@sourceware.org, Bernhard Heckel <bernhard.heckel@intel.com>
Subject: [PATCH 4/4] Fortran, typeprint: Forward level of details to be printed for pointers.
Date: Tue, 10 May 2016 14:18:00 -0000 [thread overview]
Message-ID: <1462889739-30359-5-git-send-email-bernhard.heckel@intel.com> (raw)
In-Reply-To: <1462889739-30359-1-git-send-email-bernhard.heckel@intel.com>
Variable "show" was hardcoded to zero for pointer and reference types.
This implementation didn't allow a correct "whatis" print
for those types and results in same output for "ptype" and "whatis".
Before:
(gdb) whatis t3p
type = PTR TO -> ( Type t3
integer(kind=4) :: t3_i
Type t2
integer(kind=4) :: t2_i
Type t1 :: t1_n
End Type t2 :: t2_n
End Type t3 )
After:
(gdb) whatis t3p
type = PTR TO -> ( Type t3 )
2016-05-09 Bernhard Heckel <bernhard.heckel@intel.com>
gdb/Changelog:
* f-typeprint.c (f_type_print_base): Replace 0 by show.
gdb/testsuite/Changelog:
* gdb.fortran/type.f90: Add pointer variable.
* gdb.fortran/whatis_type.exp: Add whatis/ptype of pointers.
---
gdb/f-typeprint.c | 4 ++--
gdb/testsuite/gdb.fortran/type.f90 | 9 +++++++--
gdb/testsuite/gdb.fortran/whatis_type.exp | 10 ++++++++++
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
index 0389c14..f1f0063 100644
--- a/gdb/f-typeprint.c
+++ b/gdb/f-typeprint.c
@@ -308,12 +308,12 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show,
case TYPE_CODE_PTR:
fprintf_filtered (stream, "PTR TO -> ( ");
- f_type_print_base (TYPE_TARGET_TYPE (type), stream, 0, level);
+ f_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level);
break;
case TYPE_CODE_REF:
fprintf_filtered (stream, "REF TO -> ( ");
- f_type_print_base (TYPE_TARGET_TYPE (type), stream, 0, level);
+ f_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level);
break;
case TYPE_CODE_VOID:
diff --git a/gdb/testsuite/gdb.fortran/type.f90 b/gdb/testsuite/gdb.fortran/type.f90
index 00dc650..0295a20 100644
--- a/gdb/testsuite/gdb.fortran/type.f90
+++ b/gdb/testsuite/gdb.fortran/type.f90
@@ -33,7 +33,10 @@ program type
type (t1) :: t1v
type (t2) :: t2v
- type (t3) :: t3v
+ type (t3), target :: t3v
+ type(t3), pointer :: t3p
+
+ nullify (t3p)
t1v%t1_i = 42
t1v%t1_r = 42.24
@@ -42,6 +45,8 @@ program type
t2v%t1_n%t1_i = 21
t3v%t3_i = 3
t3v%t2_n%t2_i = 32
- t3v%t2_n%t1_n%t1_i = 321 ! bp1
+ t3v%t2_n%t1_n%t1_i = 321
+
+ t3p => t3v ! bp1
end program type
diff --git a/gdb/testsuite/gdb.fortran/whatis_type.exp b/gdb/testsuite/gdb.fortran/whatis_type.exp
index c1e2745..8ac9355 100644
--- a/gdb/testsuite/gdb.fortran/whatis_type.exp
+++ b/gdb/testsuite/gdb.fortran/whatis_type.exp
@@ -44,6 +44,7 @@ gdb_test "whatis t2" "type = Type t2"
gdb_test "whatis t2v" "type = Type t2"
gdb_test "whatis t3" "type = Type t3"
gdb_test "whatis t3v" "type = Type t3"
+gdb_test "whatis t3p" "type = PTR TO -> \\( Type t3 \\)"
gdb_test "ptype t1" \
[multi_line "type = Type t1" \
@@ -74,3 +75,12 @@ gdb_test "ptype t3v" \
" Type t1 :: t1_n" \
" End Type t2 :: t2_n" \
"End Type t3"]
+
+gdb_test "ptype t3p" \
+ [multi_line "type = PTR TO -> \\( Type t3" \
+ " $int :: t3_i" \
+ " Type t2" \
+ " $int :: t2_i" \
+ " Type t1 :: t1_n" \
+ " End Type t2 :: t2_n" \
+ "End Type t3 \\)"]
--
2.7.1.339.g0233b80
next prev parent reply other threads:[~2016-05-10 14:18 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-10 14:16 [PATCH 0/4] Fortran, typeprint Bernhard Heckel
2016-05-10 14:16 ` [PATCH 2/4] Fortran, typeprint: Take level of details into account when printing elements of a structure Bernhard Heckel
2016-05-11 12:09 ` Yao Qi
2016-05-12 12:06 ` Yao Qi
2016-05-12 12:42 ` Bernhard Heckel
2016-05-10 14:16 ` [PATCH 1/4] Fortran, typeprint: Fix wrong indentation when ptype nested structures Bernhard Heckel
2016-05-11 11:58 ` Yao Qi
2016-05-11 11:59 ` Yao Qi
2016-05-10 14:16 ` [PATCH 3/4] Fortran, typeprint: Decrease level of details when printing elements of a structure Bernhard Heckel
2016-05-11 13:40 ` Yao Qi
2016-05-12 8:00 ` Bernhard Heckel
2016-05-12 12:45 ` Yao Qi
2016-05-10 14:18 ` Bernhard Heckel [this message]
2016-05-11 13:42 ` [PATCH 4/4] Fortran, typeprint: Forward level of details to be printed for pointers Yao Qi
2016-05-13 14:27 ` Yao Qi
2016-05-13 15:55 ` Yao Qi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1462889739-30359-5-git-send-email-bernhard.heckel@intel.com \
--to=bernhard.heckel@intel.com \
--cc=gdb-patches@sourceware.org \
--cc=qiyaoltc@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).