From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH] Fix ptype/o bug with "<no data fields>"
Date: Wed, 21 Apr 2021 19:49:04 -0600 [thread overview]
Message-ID: <20210422014904.3521301-1-tom@tromey.com> (raw)
I noticed that when using ptype/o, the "<no data fields>" text that
may be emitted is indented incorrectly. This patch fixes the bug and
adds a new test case.
I also removed a stray backslash from ptype-offsets.exp that I noticed
while writing the test. This seemed too trivial to warrant a separate
patch.
gdb/ChangeLog
2021-04-21 Tom Tromey <tom@tromey.com>
* c-typeprint.c (c_type_print_base_struct_union): Use
print_spaces_filtered_with_print_options.
gdb/testsuite/ChangeLog
2021-04-21 Tom Tromey <tom@tromey.com>
* gdb.base/ptype-offsets.cc (struct empty_member): New.
(main): Use empty_member.
* gdb.base/ptype-offsets.exp: Add new test.
---
gdb/ChangeLog | 5 +++++
gdb/c-typeprint.c | 7 +++----
gdb/testsuite/ChangeLog | 6 ++++++
gdb/testsuite/gdb.base/ptype-offsets.cc | 7 +++++++
gdb/testsuite/gdb.base/ptype-offsets.exp | 17 ++++++++++++++++-
5 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index f81f1c2c113..72616a59af0 100644
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -1121,13 +1121,12 @@ c_type_print_base_struct_union (struct type *type, struct ui_file *stream,
if (type->num_fields () == 0 && TYPE_NFN_FIELDS (type) == 0
&& TYPE_TYPEDEF_FIELD_COUNT (type) == 0)
{
+ print_spaces_filtered_with_print_options (level + 4, stream, flags);
if (type->is_stub ())
- fprintf_filtered (stream, _("%*s%p[<incomplete type>%p]\n"),
- level + 4, "",
+ fprintf_filtered (stream, _("%p[<incomplete type>%p]\n"),
metadata_style.style ().ptr (), nullptr);
else
- fprintf_filtered (stream, _("%*s%p[<no data fields>%p]\n"),
- level + 4, "",
+ fprintf_filtered (stream, _("%p[<no data fields>%p]\n"),
metadata_style.style ().ptr (), nullptr);
}
diff --git a/gdb/testsuite/gdb.base/ptype-offsets.cc b/gdb/testsuite/gdb.base/ptype-offsets.cc
index 4582af48cef..dc21e34752f 100644
--- a/gdb/testsuite/gdb.base/ptype-offsets.cc
+++ b/gdb/testsuite/gdb.base/ptype-offsets.cc
@@ -185,6 +185,12 @@ struct static_member
int abc;
};
+struct empty_member
+{
+ struct { } empty;
+ int an_int;
+};
+
int
main (int argc, char *argv[])
{
@@ -196,6 +202,7 @@ main (int argc, char *argv[])
struct asd f;
uint8_t i;
static_member stmember;
+ empty_member emember;
return 0;
}
diff --git a/gdb/testsuite/gdb.base/ptype-offsets.exp b/gdb/testsuite/gdb.base/ptype-offsets.exp
index f466db9a7f2..0a0bbc87062 100644
--- a/gdb/testsuite/gdb.base/ptype-offsets.exp
+++ b/gdb/testsuite/gdb.base/ptype-offsets.exp
@@ -336,7 +336,22 @@ gdb_test "ptype/o static_member" \
[string_to_regexp [multi_line \
"/* offset | size */ type = struct static_member \{" \
" static static_member Empty;" \
-"\/* 0 | 4 */ int abc;" \
+"/* 0 | 4 */ int abc;" \
"" \
" /* total size (bytes): 4 */" \
" \}"]]
+
+# Test that the "no data fields" text is indented properly.
+gdb_test "ptype/o empty_member" \
+ [string_to_regexp [multi_line \
+"/* offset | size */ type = struct empty_member \{" \
+"/* 0 | 1 */ struct {" \
+" <no data fields>" \
+"" \
+" /* total size (bytes): 1 */" \
+" } empty;" \
+"/* XXX 3-byte hole */" \
+"/* 4 | 4 */ int an_int;" \
+"" \
+" /* total size (bytes): 8 */" \
+" \}"]]
--
2.26.2
next reply other threads:[~2021-04-22 1:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-22 1:49 Tom Tromey [this message]
2021-04-22 9:31 ` Andrew Burgess
2021-04-22 13:17 ` Tom Tromey
2021-04-22 21:45 ` Lancelot SIX
2021-04-23 1:39 ` Tom Tromey
2021-04-23 6:12 ` Eli Zaretskii
2021-04-23 10:41 ` Lancelot SIX
2021-04-23 11:03 ` Eli Zaretskii
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=20210422014904.3521301-1-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/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).