Patchwork [committed] Backport changes to gcc.dg/debug/dwarf2/inline2.c to 4.4

login
register
mail settings
Submitter John David Anglin
Date Oct. 10, 2010, 6:53 p.m.
Message ID <20101010185312.GA7215@hiauly1.hia.nrc.ca>
Download mbox | patch
Permalink /patch/67361/
State New
Headers show

Comments

John David Anglin - Oct. 10, 2010, 6:53 p.m.
On 4.4 branch, gcc.dg/debug/dwarf2/inline2.c fails on hppa64-hp-hpux11.11
because of the scan problem fixed by Steve.  I backported the full set
of changes to this test.

Tested on hppa64-hp-hpux11.11.  Committed to 4.4.

Dave

Patch

Index: gcc.dg/debug/dwarf2/inline2.c
===================================================================
--- gcc.dg/debug/dwarf2/inline2.c	(revision 165233)
+++ gcc.dg/debug/dwarf2/inline2.c	(working copy)
@@ -21,27 +21,27 @@ 
    - One for each subroutine inlined into main, that's 3.
    - One for earch subroutine inline into the out of line instances
      of third, second and first.  */
-/* { dg-final { scan-assembler-times "\\(DIE \\(.*?\\) DW_TAG_inlined_subroutine" 6 } } */
+/* { dg-final { scan-assembler-times "\\(DIE \\(\[^\n\]*\\) DW_TAG_inlined_subroutine" 6 } } */
 
 /* Likewise we should have 6 DW_TAG_lexical_block DIEs:
    - One for each subroutine inlined into main, so that's 3.
    - One for each subroutine inlined in the out of line instances
      of third, second and first, that's 3.
 */
-/* { dg-final { scan-assembler-times "\\(DIE \\(.*?\\) DW_TAG_lexical_block" 6 } } */
+/* { dg-final { scan-assembler-times "\\(DIE \\(\[^\n\]*\\) DW_TAG_lexical_block" 6 } } */
 
 
 /* There are 3 DW_AT_inline attributes: one per abstract inline instance.
    The value of the attribute must be 0x3, meaning the function was
    actually inlined.  */
-/* { dg-final { scan-assembler-times "byte.*?0x3.*? DW_AT_inline" 3 } } */
+/* { dg-final { scan-assembler-times  "(?:byte|data1)\[^\n\]*0x3\[^\n\]* DW_AT_inline" 3 } } */
 
+volatile int *a;
 
 inline void
 third (int arg3)
 {
   int var3 = arg3;
-  int* a = 0;
   a[0] = var3;
 }