From 5df0091e4dc0a5460ce7d6d371eaf331a96634f5 Mon Sep 17 00:00:00 2001 From: John David Anglin Date: Sat, 16 Oct 2010 23:00:55 +0000 Subject: [PATCH] Backport PRs 18451, 40738, 40858, 45543 Backport from mainline 2010-09-06 Jakub Jelinek PR testsuite/45543 * g++.dg/debug/dwarf2/typedef1.C: Expect just one DW_TAG_enumeration_type DIE. 2010-09-04 Andreas Schwab * g++.dg/debug/dwarf2/typedef1.C: Replace ".*" by "\[^\n\]*". 2009-11-07 Jason Merrill PR c++/18451 PR c++/40738 * g++.dg/other/typedef1.C: Update expected errors. 2009-08-03 John David Anglin PR testsuite/40858 * g++.dg/debug/dwarf2/typedef1.C: Also match assembler string used with .ascii. From-SVN: r165568 --- gcc/testsuite/ChangeLog | 21 ++++++++++++++++++++ gcc/testsuite/g++.dg/debug/dwarf2/typedef1.C | 10 +++++----- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7cee93ae0a85..0f41aa67bbe6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,27 @@ 2010-10-16 John David Anglin Backport from mainline + 2010-09-06 Jakub Jelinek + + PR testsuite/45543 + * g++.dg/debug/dwarf2/typedef1.C: Expect just one + DW_TAG_enumeration_type DIE. + + 2010-09-04 Andreas Schwab + * g++.dg/debug/dwarf2/typedef1.C: Replace ".*" by "\[^\n\]*". + + 2009-11-07 Jason Merrill + + PR c++/18451 + PR c++/40738 + * g++.dg/other/typedef1.C: Update expected errors. + + 2009-08-03 John David Anglin + + PR testsuite/40858 + * g++.dg/debug/dwarf2/typedef1.C: Also match assembler string used with + .ascii. + 2010-09-04 Andreas Schwab * g++.dg/debug/dwarf2/pubnames-1.C: Replace ".*" by "\[^\n\]*". diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/typedef1.C b/gcc/testsuite/g++.dg/debug/dwarf2/typedef1.C index f325ac54ad29..a9ce44d52342 100644 --- a/gcc/testsuite/g++.dg/debug/dwarf2/typedef1.C +++ b/gcc/testsuite/g++.dg/debug/dwarf2/typedef1.C @@ -3,12 +3,12 @@ // { dg-options "-g -dA" } // { dg-do compile } // { dg-final { scan-assembler-times "DW_TAG_structure_type" 2 } } -// { dg-final { scan-assembler-times "DW_AT_name: \"foo<1u>\"" 1 } } +// { dg-final { scan-assembler-times "DW_AT_name: \"foo<1u>\"|\"foo<1u>..\"\[^\n\]*DW_AT_name" 1 } } // { dg-final { scan-assembler-times "DW_TAG_enumeration_type" 2 } } -// { dg-final { scan-assembler-times "DW_AT_name: \"typedef foo<1u>::type type\"" 1 } } -// { dg-final { scan-assembler-times "DIE (.*) DW_TAG_enumeration_type" 2 } } -// { dg-final { scan-assembler-times "\"e0..\".*DW_AT_name" 1 } } -// { dg-final { scan-assembler-times "\"e1..\".*DW_AT_name" 1 } } +// { dg-final { scan-assembler-times "DW_AT_name: \"typedef foo<1u>::type type\"|\"typedef foo<1u>::type type..\"\[^\n\]*DW_AT_name" 1 } } +// { dg-final { scan-assembler-times "DIE \\(\[^\n\]*\\) DW_TAG_enumeration_type" 1 } } +// { dg-final { scan-assembler-times "\"e0..\"\[^\n\]*DW_AT_name" 1 } } +// { dg-final { scan-assembler-times "\"e1..\"\[^\n\]*DW_AT_name" 1 } } template struct foo -- 2.47.2