[PATCH v3 13/14] gdb/testsuite: fix gdb.base/info-types-c++ with clang

[Bruno Larsen <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.
---

New in v3.

---
 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