[pushed] testsuite: fix Winvalid-memory-model*.C

[Marek Polacek]

Tested x86_64-pc-linux-gnu, applying to trunk.

-- >8 --
Commit r17-808 added a dg-additional-options to these two tests
but didn't adjust the dg-regexp line numbers.

gcc/testsuite/ChangeLog:

        * g++.dg/warn/Winvalid-memory-model-2.C: Adjust dg-regexp.
        * g++.dg/warn/Winvalid-memory-model.C: Likewise.
---
 .../g++.dg/warn/Winvalid-memory-model-2.C          | 14 +++++++-------
 gcc/testsuite/g++.dg/warn/Winvalid-memory-model.C  | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/gcc/testsuite/g++.dg/warn/Winvalid-memory-model-2.C 
b/gcc/testsuite/g++.dg/warn/Winvalid-memory-model-2.C
index 05d5c4eda21..500fb722dd3 100644
--- a/gcc/testsuite/g++.dg/warn/Winvalid-memory-model-2.C
+++ b/gcc/testsuite/g++.dg/warn/Winvalid-memory-model-2.C
@@ -26,8 +26,8 @@ void test_load (int *pi)
   *pi++ = eai.load (seq_cst);
 }
 
-/* { dg-regexp " *inlined from \[^\n\r\]+.C:23:.*" "" { target *-*-* } 0 }
-   { dg-regexp " *inlined from \[^\n\r\]+.C:24:.*" "" { target *-*-* } 0 }
+/* { dg-regexp " *inlined from \[^\n\r\]+.C:24:.*" "" { target *-*-* } 0 }
+   { dg-regexp " *inlined from \[^\n\r\]+.C:25:.*" "" { target *-*-* } 0 }
    { dg-warning "__atomic_load\[^\n\r\]* \\\[-Winvalid-memory-model" "warning" 
{ target *-*-* } 0 } */
 
 
@@ -41,9 +41,9 @@ void test_store (int *pi)
   eai.store (*pi++, seq_cst);
 }
 
-/* { dg-regexp " *inlined from \[^\n\r\]+.C:36:.*" "" { target *-*-* } 0 }
-   { dg-regexp " *inlined from \[^\n\r\]+.C:37:.*" "" { target *-*-* } 0 }
-   { dg-regexp " *inlined from \[^\n\r\]+.C:39:.*" "" { target *-*-* } 0 }
+/* { dg-regexp " *inlined from \[^\n\r\]+.C:37:.*" "" { target *-*-* } 0 }
+   { dg-regexp " *inlined from \[^\n\r\]+.C:38:.*" "" { target *-*-* } 0 }
+   { dg-regexp " *inlined from \[^\n\r\]+.C:40:.*" "" { target *-*-* } 0 }
    { dg-warning "__atomic_store\[^\n\r]* \\\[-Winvalid-memory-model" "warning" 
{ target *-*-* } 0 } */
 
 
@@ -71,10 +71,10 @@ void test_compare_exchange (int *pi, int *pj)
   cmpxchg (&eai, pi++, *pj++, relaxed, seq_cst);  // warning
   cmpxchg (&eai, pi++, *pj++, relaxed, relaxed);
 
-  /* { dg-regexp " *inlined from \[^\n\r\]+.C:66:.*" "" { target *-*-* } 0 }
-     { dg-regexp " *inlined from \[^\n\r\]+.C:67:.*" "" { target *-*-* } 0 }
+  /* { dg-regexp " *inlined from \[^\n\r\]+.C:67:.*" "" { target *-*-* } 0 }
      { dg-regexp " *inlined from \[^\n\r\]+.C:68:.*" "" { target *-*-* } 0 }
      { dg-regexp " *inlined from \[^\n\r\]+.C:69:.*" "" { target *-*-* } 0 }
      { dg-regexp " *inlined from \[^\n\r\]+.C:70:.*" "" { target *-*-* } 0 }
+     { dg-regexp " *inlined from \[^\n\r\]+.C:71:.*" "" { target *-*-* } 0 }
      { dg-warning "__atomic_compare_exchange\[^\n\r\]* 
\\\[-Winvalid-memory-model" "cmpxchg 1" { target *-*-* } 0 } */
 }
diff --git a/gcc/testsuite/g++.dg/warn/Winvalid-memory-model.C 
b/gcc/testsuite/g++.dg/warn/Winvalid-memory-model.C
index 509ce280534..497f3623dd0 100644
--- a/gcc/testsuite/g++.dg/warn/Winvalid-memory-model.C
+++ b/gcc/testsuite/g++.dg/warn/Winvalid-memory-model.C
@@ -26,8 +26,8 @@ void test_load (int *pi)
   *pi++ = eai.load (seq_cst);
 }
 
-/* { dg-regexp " *inlined from \[^\n\r\]+.C:23:.*" "" { target *-*-* } 0 }
-   { dg-regexp " *inlined from \[^\n\r\]+.C:24:.*" "" { target *-*-* } 0 }
+/* { dg-regexp " *inlined from \[^\n\r\]+.C:24:.*" "" { target *-*-* } 0 }
+   { dg-regexp " *inlined from \[^\n\r\]+.C:25:.*" "" { target *-*-* } 0 }
    { dg-warning "__atomic_load\[^\n\r\]* \\\[-Winvalid-memory-model" "warning" 
{ target *-*-* } 0 } */
 
 
@@ -41,9 +41,9 @@ void test_store (int *pi)
   eai.store (*pi++, seq_cst);
 }
 
-/* { dg-regexp " *inlined from \[^\n\r\]+.C:36:.*" "" { target *-*-* } 0 }
-   { dg-regexp " *inlined from \[^\n\r\]+.C:37:.*" "" { target *-*-* } 0 }
-   { dg-regexp " *inlined from \[^\n\r\]+.C:39:.*" "" { target *-*-* } 0 }
+/* { dg-regexp " *inlined from \[^\n\r\]+.C:37:.*" "" { target *-*-* } 0 }
+   { dg-regexp " *inlined from \[^\n\r\]+.C:38:.*" "" { target *-*-* } 0 }
+   { dg-regexp " *inlined from \[^\n\r\]+.C:40:.*" "" { target *-*-* } 0 }
    { dg-warning "__atomic_store\[^\n\r]* \\\[-Winvalid-memory-model" "warning" 
{ target *-*-* } 0 } */
 
 
@@ -76,10 +76,10 @@ void test_compare_exchange (int *pi, int *pj)
 
   /* HACK: xfail doesn't seem to work for the dg-regexp directives below,
      so disable them by prepending an X to their names...
-    { Xdg-regexp " *inlined from \[^\n\r\]+.C:66:.*" "" { xfail *-*-* } 0 }
     { Xdg-regexp " *inlined from \[^\n\r\]+.C:67:.*" "" { xfail *-*-* } 0 }
     { Xdg-regexp " *inlined from \[^\n\r\]+.C:68:.*" "" { xfail *-*-* } 0 }
     { Xdg-regexp " *inlined from \[^\n\r\]+.C:69:.*" "" { xfail *-*-* } 0 }
     { Xdg-regexp " *inlined from \[^\n\r\]+.C:70:.*" "" { xfail *-*-* } 0 }
+    { Xdg-regexp " *inlined from \[^\n\r\]+.C:71:.*" "" { xfail *-*-* } 0 }
     { dg-warning "__atomic_compare_exchange\[^\n\r\]* 
\\\[-Winvalid-memory-model" "cmpxchg 1" { xfail *-*-* } 0 } */
 }

base-commit: 4a97237ac39074b1083df4490d0fa6815c2ed595
-- 
2.54.0