From patchwork Wed Aug  4 14:26:38 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [testsuite] : Expand regexp in PR c++/44641
Date: Wed, 04 Aug 2010 04:26:38 -0000
From: Uros Bizjak <ubizjak@gmail.com>
X-Patchwork-Id: 60854
Message-Id: <AANLkTi=GCHnfHfvmKo1H7zTbEeYE2nVGROw91c8hRF1h@mail.gmail.com>
To: gcc-patches@gcc.gnu.org

Hello!

Attached patch fixes PR c++/44641 by expanding regexp in
dg-function-on-line to also ignore .mask and .frame assembler
directives.

2010-08-04  Uros Bizjak  <ubizjak@gmail.com>

	PR c++/44641
	* lib/scanasm.exp (dg-function-on-line): Expand regex to also ignore
	.frame and .mask assembler directives.

Patch was tested on x86_64-pc-linux-gnu and alphaev68-pc-linux-gnu,
where fixes all failures in g++.dg/debug/dwarf2 directory. Also,
dg-function-on-line functionality was tested by perturbing
lineno-simple1.C and pr44641.C testcases a bit for both targets.

Patch was committed to SVN mainline as obvious.

Uros.


Index: lib/scanasm.exp
===================================================================
--- lib/scanasm.exp	(revision 162854)
+++ lib/scanasm.exp	(working copy)
@@ -316,7 +316,7 @@
 	}
     }
 
-    set pattern [format {%s:[^\t]*(\t.file[^\t]*)?\t[^:]+:%d\n} \
+    set pattern [format {%s:[^\t]*(\t.(frame|mask|file)[^\t]*)*\t[^:]+:%d\n} \
                  $symbol $line]
 
     # The lack of spaces around $pattern is important, since they'd