From ee8505183c50f850509bf52855488259c53544fc Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Tue, 25 Sep 2018 19:04:44 +0000 Subject: [PATCH] adjust dinst.adb's expectations for location views The testcase failed when the compiler used .loc view syntax, because it expected discriminators at the end of the .loc lines. for gcc/testsuite/ChangeLog * gnat.dg/dinst.adb: Adjust for locviews. From-SVN: r264583 --- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gnat.dg/dinst.adb | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index da2d96c4a30..05dbb0d40ea 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2018-09-25 Alexandre Oliva + + * gnat.dg/dinst.adb: Adjust for locviews. + 2018-09-25 Will Schmidt * g++.dg/ext/altivec-6.C: Updated vec_splat() calls. diff --git a/gcc/testsuite/gnat.dg/dinst.adb b/gcc/testsuite/gnat.dg/dinst.adb index 460e6c5f914..d5ccc9c3cb0 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; -- 2.30.2