Patchwork Support ARM assembly comment prefix in g++.dg/debug/dwarf2/nested-2.C

login
register
mail settings
Submitter Marcus Shawcroft
Date Sept. 22, 2010, 3:37 p.m.
Message ID <000801cb5a6c$2067c330$61374990$@shawcroft@arm.com>
Download mbox | patch
Permalink /patch/65431/
State New
Headers show

Comments

Marcus Shawcroft - Sept. 22, 2010, 3:37 p.m.
Hi,

The GCC test case g++.dg/debug/dwarf2/nested-2.C contains a hard wired
regexp which looks for assembly comment prefix characters. The current
pattern does not permit the ARM comment prefix @ character.

 2010-09-22  Marcus Shawcroft  <marcus.shawcroft@arm.com>

        * g++.dg/debug/dwarf2/nested-2.C: Permit the ARM @ character
        as a comment leader in regexp.

/Marcus
Richard Earnshaw - Sept. 24, 2010, 10:08 a.m.
On Wed, 2010-09-22 at 16:37 +0100, Marcus Shawcroft wrote:
> Hi,
> 
> The GCC test case g++.dg/debug/dwarf2/nested-2.C contains a hard wired
> regexp which looks for assembly comment prefix characters. The current
> pattern does not permit the ARM comment prefix @ character.
> 
>  2010-09-22  Marcus Shawcroft  <marcus.shawcroft@arm.com>
> 
>         * g++.dg/debug/dwarf2/nested-2.C: Permit the ARM @ character
>         as a comment leader in regexp.
> 
> /Marcus

OK.

R.

Patch

diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/nested-2.C b/gcc/testsuite/g++.dg/debug/dwarf2/nested-2.C
index 2ab0c37..65d382b 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/nested-2.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/nested-2.C
@@ -32,6 +32,6 @@  We want to express that the DIE of S::T<int> must be a child of the DIE of S, li
 
 Hence the slightly odd regexp:
 
-  { dg-final { scan-assembler "\[^\n\r\]*\\(DIE\[^\n\r\]*DW_TAG_structure_type\\)\[\n\r\]+\[^\n\r\]*\"S\\\\0\"\[ \t\]+\(#|!|//?\)\[ \t\]+DW_AT_name\[\n\r\]+\(.*\)?\\(DIE\[^\n\r\]*DW_TAG_structure_type\\)\[\n\r\]+\[^\n\r\]*\"T<int>\\\\0\"\[ \t\]+\(.*\)?\\(DIE\[^\n\r\]*DW_TAG_template_type_param\\)\[\n\r\]+\[^\n\r\]*\[\n\r\]+\[^\n\r\]*\[\n\r\]+\[^\n\r\]*\(#|!|//?\)\[ \t\]+end of children of DIE\[^\n\r\]*\[\n\r\]+\[^\n\r\]*end of children of DIE\[^\n\r\]*" } }
+  { dg-final { scan-assembler "\[^\n\r\]*\\(DIE\[^\n\r\]*DW_TAG_structure_type\\)\[\n\r\]+\[^\n\r\]*\"S\\\\0\"\[ \t\]+\(@|#|!|//?\)\[ \t\]+DW_AT_name\[\n\r\]+\(.*\)?\\(DIE\[^\n\r\]*DW_TAG_structure_type\\)\[\n\r\]+\[^\n\r\]*\"T<int>\\\\0\"\[ \t\]+\(.*\)?\\(DIE\[^\n\r\]*DW_TAG_template_type_param\\)\[\n\r\]+\[^\n\r\]*\[\n\r\]+\[^\n\r\]*\[\n\r\]+\[^\n\r\]*\(@|#|!|//?\)\[ \t\]+end of children of DIE\[^\n\r\]*\[\n\r\]+\[^\n\r\]*end of children of DIE\[^\n\r\]*" } }
 
  */