From 11c16c2a22667d1738e90ac5b754439f03b4dff2 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 14 Jun 2017 08:25:06 +0200
Subject: [PATCH] vrp101.c: Fix scan-tree-dump regex.

	* gcc.dg/tree-ssa/vrp101.c: Fix scan-tree-dump regex.
	* gcc.dg/tree-ssa/builtin-sprintf-2.c: Likewise.  Adjust comment.

From-SVN: r249180
---
 gcc/testsuite/ChangeLog                           |  5 +++++
 gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-2.c | 10 +++++-----
 gcc/testsuite/gcc.dg/tree-ssa/vrp101.c            |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f32b8c82586..1378dc8946c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.dg/tree-ssa/vrp101.c: Fix scan-tree-dump regex.
+	* gcc.dg/tree-ssa/builtin-sprintf-2.c: Likewise.  Adjust comment.
+
 2017-06-13  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/80973
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-2.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-2.c
index e15d88b7341..17908ac6c41 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-2.c
@@ -279,18 +279,18 @@ RNG (0,  6,   8, "%s%ls", "1", L"2");
    <bb 2>:
    result_3 = __builtin_sprintf (&MEM[(void *)&buf8k + 8192B], "%c", 32);
    if (result_3 != 0)
-     goto <bb 3>; [50.0%]
+     goto <bb 3>; [50.0%] [count: INV]
    else
-     goto <bb 4>; [50.0%]
+     goto <bb 4>; [50.0%] [count: INV]
 
-   <bb 3>[50.0%]:
+   <bb 3>[50.0%] [count: INV]:
    must_not_eliminate ();
 
 */
 
 /*  Only conditional calls to must_not_eliminate must be made (with
     any probability):
-    { dg-final { scan-tree-dump-times "> \\\[\[0-9.\]+%\\\]\\ \\\[count:\\[^:\\]*\\\]:\n *must_not_eliminate" 127 "optimized" { target { ilp32 || lp64 } } } }
-    { dg-final { scan-tree-dump-times "> \\\[\[0-9.\]+%\\\]\\ \\\[count:\\[^:\\]*\\\]:\n *must_not_eliminate" 96 "optimized" { target { { ! ilp32 } && { ! lp64 } } } } }
+    { dg-final { scan-tree-dump-times "> \\\[\[0-9.\]+%\\\] \\\[count: \[^0-9INV\]*\\\]:\n *must_not_eliminate" 127 "optimized" { target { ilp32 || lp64 } } } }
+    { dg-final { scan-tree-dump-times "> \\\[\[0-9.\]+%\\\] \\\[count: \[^0-9INV\]*\\\]:\n *must_not_eliminate" 96 "optimized" { target { { ! ilp32 } && { ! lp64 } } } } }
     No unconditional calls to abort should be made:
     { dg-final { scan-tree-dump-not ";\n *must_not_eliminate" "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp101.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp101.c
index e7cad289763..c9feb256857 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp101.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp101.c
@@ -10,4 +10,4 @@ int main ()
   return 0;
 }
 
-/* { dg-final { scan-tree-dump "<bb 2> \\\[\[0-9.\]+%\\\] \\\[count: \\[^:\\]*\\\]:\[\n\r \]*return 0;" "optimized" } } */
+/* { dg-final { scan-tree-dump "<bb 2> \\\[\[0-9.\]+%\\\] \\\[count: \[0-9INV\]*\\\]:\[\n\r \]*return 0;" "optimized" } } */
-- 
2.30.2