From patchwork Tue Sep 25 19:03:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 974670 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-486368-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="j2Ey0ilh"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42KVq56prQz9s2P for ; Wed, 26 Sep 2018 05:04:00 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:mime-version:content-type; q=dns; s=default; b=ZGK+reOhsh0NjEfNygI0lxWapSmtdEd1X/UdTj4MM0B2OHbQl7 HsLBzopE33ZHzUorPxW98UH4W5eQ6Lq/D8VbFcOW2HwD7ruzedyeSvlJf0KnNyQi w2r4gCPvqhZLtmMNG/l4UmoarG0ZCpJSwqHhheMqDd4/jT3KQ5TntkrUo= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:mime-version:content-type; s= default; bh=G8F0vzCtlwMCC5ynOPHv7I7kov4=; b=j2Ey0ilh6so/ri5SSWqs UUIn3H1/1dGXq9bWRtqnaOhFiS3rLyFImQJ67WbP4AmY8/JzMuaynxyZGeXDorbc BWl+KBiwnGQSID0HqWnGxPwAsSxWOZwi7zm9YN3T0BYYlKffduHYJRWp7Wh8DC+X QLjdZvhL5B0X1FfVPu1zv8g= Received: (qmail 3117 invoked by alias); 25 Sep 2018 19:03:52 -0000 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 Received: (qmail 3100 invoked by uid 89); 25 Sep 2018 19:03:52 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=views, expectations, blogs, america X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 25 Sep 2018 19:03:50 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 3997E11619E; Tue, 25 Sep 2018 15:03:48 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 0nLeCXURVGSn; Tue, 25 Sep 2018 15:03:48 -0400 (EDT) Received: from free.home (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPS id EA776116116; Tue, 25 Sep 2018 15:03:47 -0400 (EDT) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTP id w8PJ3d0e266420; Tue, 25 Sep 2018 16:03:40 -0300 From: Alexandre Oliva To: gcc-patches@gcc.gnu.org Cc: Eric Botcazou , Olivier Hainque Subject: adjust dinst.adb's expectations for location views Date: Tue, 25 Sep 2018 16:03:39 -0300 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 The testcase failed when the compiler used .loc view syntax, because it expected discriminators at the end of the .loc lines. Tested with both -gas-locview-support and -gno-as-locview-support. I'm checking it in as obvious. for gcc/testsuite/ChangeLog * gnat.dg/dinst.adb: Adjust for locviews. --- gcc/testsuite/gnat.dg/dinst.adb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/gnat.dg/dinst.adb b/gcc/testsuite/gnat.dg/dinst.adb index 460e6c5f914f4..d5ccc9c3cb05c 100644 --- a/gcc/testsuite/gnat.dg/dinst.adb +++ b/gcc/testsuite/gnat.dg/dinst.adb @@ -1,9 +1,9 @@ -- { dg-do compile { target *-*-gnu* } } -- { dg-options "-gnateS -gdwarf -g -O -gno-column-info" } --- { dg-final { scan-assembler "loc \[0-9] 5 \[0-9]( is_stmt \[0-9])? discriminator 1\n" } } */ --- { dg-final { scan-assembler-not "loc \[0-9] 5 \[0-9]( is_stmt \[0-9])? discriminator 2\n" } } */ --- { dg-final { scan-assembler "loc \[0-9] 5 \[0-9]( is_stmt \[0-9])? discriminator 3\n" } } */ --- { dg-final { scan-assembler "loc \[0-9] 5 \[0-9]( is_stmt \[0-9])? discriminator 4\n" } } */ +-- { dg-final { scan-assembler "loc \[0-9] 5 \[0-9]( is_stmt \[0-9])? discriminator 1\[ \n]" } } */ +-- { dg-final { scan-assembler-not "loc \[0-9] 5 \[0-9]( is_stmt \[0-9])? discriminator 2\[ \n]" } } */ +-- { dg-final { scan-assembler "loc \[0-9] 5 \[0-9]( is_stmt \[0-9])? discriminator 3\[ \n]" } } */ +-- { dg-final { scan-assembler "loc \[0-9] 5 \[0-9]( is_stmt \[0-9])? discriminator 4\[ \n]" } } */ with DInst_Pkg;