From: Bruno Larsen <blarsen@redhat.com>
To: gdb-patches@sourceware.org
Subject: [PATCH v4 13/15] gdb/testsuite: fix gdb.base/info-types-c++ with clang
Date: Wed, 20 Jul 2022 16:44:39 -0300 [thread overview]
Message-ID: <20220720194441.168906-15-blarsen@redhat.com> (raw)
In-Reply-To: <20220720194441.168906-1-blarsen@redhat.com>
When g++ compiles nameles structs defined in a typedef, it adds a
DW_AT_linkage_name with the name defined in the typedef. So when
running gdb.base/info-types-c++.exp by default, we get the following
output
All defined types:
File ../../../common/git-repos/binutils-gdb/gdb/testsuite/gdb.base/info-types.c:
98: CL;
42: anon_struct_t;
65: anon_union_t;
21: baz_t;
33: enum_t;
56: union_t;
52: typedef enum {...} anon_enum_t;
45: typedef anon_struct_t anon_struct_t;
68: typedef anon_union_t anon_union_t;
Clang[++] does not add DW_AT_linkage_name, and so it's output looks like
this:
All defined types:
File ../../../common/git-repos/binutils-gdb/gdb/testsuite/gdb.base/info-types.c:
98: CL;
21: baz_t;
33: enum_t;
56: union_t;
52: typedef enum {...} anon_enum_t;
45: typedef struct {...} anon_struct_t;
68: typedef union {...} anon_union_t;
Which is still correct output for GDB, but shows up as a failure when
running the test. This commit changes the test to allow for this output
when the compiler is clang.
---
gdb/testsuite/gdb.base/info-types.exp.tcl | 109 +++++++++++++++-------
1 file changed, 73 insertions(+), 36 deletions(-)
diff --git a/gdb/testsuite/gdb.base/info-types.exp.tcl b/gdb/testsuite/gdb.base/info-types.exp.tcl
index 2dd9b9e5489..b6a03276f69 100644
--- a/gdb/testsuite/gdb.base/info-types.exp.tcl
+++ b/gdb/testsuite/gdb.base/info-types.exp.tcl
@@ -41,42 +41,79 @@ proc run_test { lang } {
set file_re "File .*[string_to_regexp $srcfile]:"
if { $lang == "c++" } {
- set output_lines \
- [list \
- "^All defined types:" \
- ".*" \
- $file_re \
- "98:\[\t \]+CL;" \
- "42:\[\t \]+anon_struct_t;" \
- "65:\[\t \]+anon_union_t;" \
- "21:\[\t \]+baz_t;" \
- "33:\[\t \]+enum_t;" \
- "56:\[\t \]+union_t;" \
- "52:\[\t \]+typedef enum {\\.\\.\\.} anon_enum_t;" \
- "45:\[\t \]+typedef anon_struct_t anon_struct_t;" \
- "68:\[\t \]+typedef anon_union_t anon_union_t;" \
- "28:\[\t \]+typedef baz_t baz;" \
- "31:\[\t \]+typedef baz_t \\* baz_ptr;" \
- "27:\[\t \]+typedef baz_t baz_t;" \
- "\[\t \]+double" \
- "\[\t \]+float" \
- "\[\t \]+int" \
- "103:\[\t \]+typedef CL my_cl;" \
- "38:\[\t \]+typedef enum_t my_enum_t;" \
- "17:\[\t \]+typedef float my_float_t;" \
- "16:\[\t \]+typedef int my_int_t;" \
- "104:\[\t \]+typedef CL \\* my_ptr;" \
- "54:\[\t \]+typedef enum {\\.\\.\\.} nested_anon_enum_t;" \
- "47:\[\t \]+typedef anon_struct_t nested_anon_struct_t;" \
- "70:\[\t \]+typedef anon_union_t nested_anon_union_t;" \
- "30:\[\t \]+typedef baz_t nested_baz;" \
- "29:\[\t \]+typedef baz_t nested_baz_t;" \
- "39:\[\t \]+typedef enum_t nested_enum_t;" \
- "19:\[\t \]+typedef float nested_float_t;" \
- "18:\[\t \]+typedef int nested_int_t;" \
- "62:\[\t \]+typedef union_t nested_union_t;(" \
- "\[\t \]+unsigned int)?" \
- "($|\r\n.*)"]
+ if { [test_compiler_info "clang-*"] } {
+ set output_lines \
+ [list \
+ "^All defined types:" \
+ ".*" \
+ $file_re \
+ "98:\[\t \]+CL;" \
+ "21:\[\t \]+baz_t;" \
+ "33:\[\t \]+enum_t;" \
+ "56:\[\t \]+union_t;" \
+ "52:\[\t \]+typedef enum {\\.\\.\\.} anon_enum_t;" \
+ "45:\[\t \]+typedef struct {\\.\\.\\.} anon_struct_t;" \
+ "68:\[\t \]+typedef union {\\.\\.\\.} anon_union_t;" \
+ "28:\[\t \]+typedef baz_t baz;" \
+ "31:\[\t \]+typedef baz_t \\* baz_ptr;" \
+ "27:\[\t \]+typedef baz_t baz_t;" \
+ "\[\t \]+double" \
+ "\[\t \]+float" \
+ "\[\t \]+int" \
+ "103:\[\t \]+typedef CL my_cl;" \
+ "38:\[\t \]+typedef enum_t my_enum_t;" \
+ "17:\[\t \]+typedef float my_float_t;" \
+ "16:\[\t \]+typedef int my_int_t;" \
+ "104:\[\t \]+typedef CL \\* my_ptr;" \
+ "54:\[\t \]+typedef enum {\\.\\.\\.} nested_anon_enum_t;" \
+ "47:\[\t \]+typedef struct {\\.\\.\\.} nested_anon_struct_t;" \
+ "70:\[\t \]+typedef union {\\.\\.\\.} nested_anon_union_t;" \
+ "30:\[\t \]+typedef baz_t nested_baz;" \
+ "29:\[\t \]+typedef baz_t nested_baz_t;" \
+ "39:\[\t \]+typedef enum_t nested_enum_t;" \
+ "19:\[\t \]+typedef float nested_float_t;" \
+ "18:\[\t \]+typedef int nested_int_t;" \
+ "62:\[\t \]+typedef union_t nested_union_t;(" \
+ "\[\t \]+unsigned int)?" \
+ "($|\r\n.*)"]
+ } else {
+ set output_lines \
+ [list \
+ "^All defined types:" \
+ ".*" \
+ $file_re \
+ "98:\[\t \]+CL;" \
+ "42:\[\t \]+anon_struct_t;" \
+ "65:\[\t \]+anon_union_t;" \
+ "21:\[\t \]+baz_t;" \
+ "33:\[\t \]+enum_t;" \
+ "56:\[\t \]+union_t;" \
+ "52:\[\t \]+typedef enum {\\.\\.\\.} anon_enum_t;" \
+ "45:\[\t \]+typedef anon_struct_t anon_struct_t;" \
+ "68:\[\t \]+typedef anon_union_t anon_union_t;" \
+ "28:\[\t \]+typedef baz_t baz;" \
+ "31:\[\t \]+typedef baz_t \\* baz_ptr;" \
+ "27:\[\t \]+typedef baz_t baz_t;" \
+ "\[\t \]+double" \
+ "\[\t \]+float" \
+ "\[\t \]+int" \
+ "103:\[\t \]+typedef CL my_cl;" \
+ "38:\[\t \]+typedef enum_t my_enum_t;" \
+ "17:\[\t \]+typedef float my_float_t;" \
+ "16:\[\t \]+typedef int my_int_t;" \
+ "104:\[\t \]+typedef CL \\* my_ptr;" \
+ "54:\[\t \]+typedef enum {\\.\\.\\.} nested_anon_enum_t;" \
+ "47:\[\t \]+typedef anon_struct_t nested_anon_struct_t;" \
+ "70:\[\t \]+typedef anon_union_t nested_anon_union_t;" \
+ "30:\[\t \]+typedef baz_t nested_baz;" \
+ "29:\[\t \]+typedef baz_t nested_baz_t;" \
+ "39:\[\t \]+typedef enum_t nested_enum_t;" \
+ "19:\[\t \]+typedef float nested_float_t;" \
+ "18:\[\t \]+typedef int nested_int_t;" \
+ "62:\[\t \]+typedef union_t nested_union_t;(" \
+ "\[\t \]+unsigned int)?" \
+ "($|\r\n.*)"]
+ }
} else {
set output_lines \
[list \
--
2.31.1
next prev parent reply other threads:[~2022-07-20 19:45 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-20 19:44 [PATCH v4 00/15] Clean gdb.base when testing " Bruno Larsen
2022-07-20 19:44 ` [PATCH v4 01/15] gdb/testsuite: introduce gdb_step_until Bruno Larsen
2022-07-20 19:44 ` [PATCH v4 01/15] gdb/testsuite: introduce gdb_step_until_regexp Bruno Larsen
2022-07-20 19:44 ` [PATCH v4 02/15] gdb/testsuite: Add a proc to test where compiler links the epilogue Bruno Larsen
2022-09-13 12:17 ` Andrew Burgess
2022-07-20 19:44 ` [PATCH v4 03/15] Change gdb.base/skip-solib.exp deal with lack of epilogue information Bruno Larsen
2022-09-10 9:53 ` Andrew Burgess
2022-07-20 19:44 ` [PATCH v4 04/15] gdb/testsuite: change gdb.base/nodebug.exp to not fail with clang Bruno Larsen
2022-09-12 9:08 ` Andrew Burgess
2022-09-12 12:17 ` Bruno Larsen
2022-07-20 19:44 ` [PATCH v4 05/15] update gdb.base/info-program.exp " Bruno Larsen
2022-09-12 9:34 ` Andrew Burgess
2022-09-12 12:18 ` Bruno Larsen
2022-07-20 19:44 ` [PATCH v4 06/15] fix gdb.base/access-mem-running.exp for clang testing Bruno Larsen
2022-09-12 9:41 ` Andrew Burgess
2022-09-12 12:18 ` Bruno Larsen
2022-07-20 19:44 ` [PATCH v4 07/15] Fix gdb.base/call-ar-st to work with Clang Bruno Larsen
2022-09-12 10:30 ` Andrew Burgess
2022-09-12 12:18 ` Bruno Larsen
2022-07-20 19:44 ` [PATCH v4 08/15] add xfails to gdb.base/complex-parts.exp when testing with clang Bruno Larsen
2022-09-12 10:49 ` Andrew Burgess
2022-09-12 12:18 ` Bruno Larsen
2022-07-20 19:44 ` [PATCH v4 09/15] gdb/testsuite: fix gdb.base/msym-bp-shl when running with Clang Bruno Larsen
2022-09-12 10:58 ` Andrew Burgess
2022-09-12 12:30 ` Bruno Larsen
2022-07-20 19:44 ` [PATCH v4 10/15] explicitly test for stderr in gdb.base/dprintf.exp Bruno Larsen
2022-09-12 12:20 ` Andrew Burgess
2022-09-13 12:08 ` Bruno Larsen
2022-07-20 19:44 ` [PATCH v4 11/15] gdb/testsuite: Update gdb.base/so-impl-ld.exp Bruno Larsen
2022-09-12 12:30 ` Andrew Burgess
2022-09-13 12:08 ` Bruno Larsen
2022-07-20 19:44 ` [PATCH v4 12/15] [gdb/testsuite]: fix gdb.base/jit-elf.exp when testing with clang Bruno Larsen
2022-09-12 12:54 ` Andrew Burgess
2022-07-20 19:44 ` Bruno Larsen [this message]
2022-09-12 14:35 ` [PATCH v4 13/15] gdb/testsuite: fix gdb.base/info-types-c++ " Andrew Burgess
2022-09-14 11:31 ` Bruno Larsen
2022-07-20 19:44 ` [PATCH v4 14/15] gdb.base/skip.exp: Use finish to exit functions Bruno Larsen
2022-09-12 16:57 ` Andrew Burgess
2022-07-20 19:44 ` [PATCH v4 15/15] gdb/testsuite: Add test to step through function epilogue Bruno Larsen
2022-09-08 12:04 ` Andrew Burgess
2022-08-09 16:53 ` [PIING][PATCH v4 00/15] Clean gdb.base when testing with clang Bruno Larsen
2022-08-18 7:25 ` [PINGv2][PATCH " Bruno Larsen
2022-08-25 7:51 ` [PINGv3][PATCH " Bruno Larsen
2022-09-05 14:59 ` [PINGv4][PATCH " Bruno Larsen
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=20220720194441.168906-15-blarsen@redhat.com \
--to=blarsen@redhat.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).