From: John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
Date: Sun, 10 Oct 2010 18:48:15 +0000 (+0000)
Subject: backport: inline2.c: Replace ".*" by "\[^\n\]*".
X-Git-Tag: releases/gcc-4.4.6~321
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8ee2f4ad07ad6f178ccea6042311179f7aac9dc;p=thirdparty%2Fgcc.git

backport: inline2.c: Replace ".*" by "\[^\n\]*".

	Backport from mainline
	2010-09-04  Andreas Schwab  <schwab@linux-m68k.org>

	* gcc.dg/debug/dwarf2/inline2.c: Replace ".*" by "\[^\n\]*".

	2010-03-24  Jakub Jelinek  <jakub@redhat.com>

	* gcc.dg/debug/dwarf2/inline2.c (third): Make a a global var
	and add volatile keyword.

	2009-11-23  Steve Ellcey  <sje@cup.hp.com>

	* gcc.dg/debug/dwarf2/inline2.c: Modify scan.

From-SVN: r165260
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 542045ff97fa..1cad602a4739 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-10  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	Backport from mainline
+	2010-09-04  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* gcc.dg/debug/dwarf2/inline2.c: Replace ".*" by "\[^\n\]*".
+
+	2010-03-24  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.dg/debug/dwarf2/inline2.c (third): Make a a global var
+	and add volatile keyword.
+
+	2009-11-23  Steve Ellcey  <sje@cup.hp.com>
+
+	* gcc.dg/debug/dwarf2/inline2.c: Modify scan.
+
 2010-10-10  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	* gcc.dg/torture/pr41555.c: Require stdint types.
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/inline2.c b/gcc/testsuite/gcc.dg/debug/dwarf2/inline2.c
index 3a6318ea586c..20edb588ea85 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/inline2.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/inline2.c
@@ -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;
 }