From patchwork Wed Aug 4 14:26:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uros Bizjak X-Patchwork-Id: 60854 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 9E473B6EF2 for ; Thu, 5 Aug 2010 00:26:55 +1000 (EST) Received: (qmail 886 invoked by alias); 4 Aug 2010 14:26:49 -0000 Received: (qmail 868 invoked by uid 22791); 4 Aug 2010 14:26:48 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, TW_ZJ, T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: sourceware.org Received: from mail-qw0-f47.google.com (HELO mail-qw0-f47.google.com) (209.85.216.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 04 Aug 2010 14:26:42 +0000 Received: by qwg8 with SMTP id 8so3150955qwg.20 for ; Wed, 04 Aug 2010 07:26:40 -0700 (PDT) MIME-Version: 1.0 Received: by 10.224.82.145 with SMTP id b17mr3840871qal.62.1280932000574; Wed, 04 Aug 2010 07:26:40 -0700 (PDT) Received: by 10.229.35.4 with HTTP; Wed, 4 Aug 2010 07:26:38 -0700 (PDT) Date: Wed, 4 Aug 2010 16:26:38 +0200 Message-ID: Subject: [PATCH, testsuite]: Expand regexp in PR c++/44641 From: Uros Bizjak To: gcc-patches@gcc.gnu.org Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list 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 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