From 6030f6fe258b81f2e3a8952ef3162772bb6e684e Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 28 Feb 2018 10:43:10 +0100
Subject: [PATCH] re PR c++/83871 (wrong code for attribute const and pure on
 distinct template specializations)

	PR c++/83871
	PR c++/83503
	* g++.dg/ext/attr-warning.C: Remove -fdump-tree-optimized from
	dg-options.
	* g++.dg/ext/attr-nonnull.C: Likewise.
	* g++.dg/ext/attr-noinline.C: Fix syntax in scan-tree-dump-not directives.
	* g++.dg/ext/attr-noinline-2.C: Likewise.
	* g++.dg/ext/attr-noreturn-2.C: Use -fdump-tree-optimized instead of
	-fdump-tree-eh in dg-options.

From-SVN: r258059
---
 gcc/testsuite/ChangeLog                    | 12 ++++++++++++
 gcc/testsuite/g++.dg/ext/attr-noinline-2.C |  2 +-
 gcc/testsuite/g++.dg/ext/attr-noinline.C   |  4 ++--
 gcc/testsuite/g++.dg/ext/attr-nonnull.C    |  2 +-
 gcc/testsuite/g++.dg/ext/attr-noreturn-2.C |  2 +-
 gcc/testsuite/g++.dg/ext/attr-warning.C    |  2 +-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e548fc91cd5..c036308c6e5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2018-02-28  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/83871
+	PR c++/83503
+	* g++.dg/ext/attr-warning.C: Remove -fdump-tree-optimized from
+	dg-options.
+	* g++.dg/ext/attr-nonnull.C: Likewise.
+	* g++.dg/ext/attr-noinline.C: Fix syntax in scan-tree-dump-not directives.
+	* g++.dg/ext/attr-noinline-2.C: Likewise.
+	* g++.dg/ext/attr-noreturn-2.C: Use -fdump-tree-optimized instead of
+	-fdump-tree-eh in dg-options.
+
 2018-02-28  Alan Modra  <amodra@gmail.com>
 
 	* lib/prune.exp (prune_gcc_output): Match lower case "in function"
diff --git a/gcc/testsuite/g++.dg/ext/attr-noinline-2.C b/gcc/testsuite/g++.dg/ext/attr-noinline-2.C
index 4aab4f16f1e..b56a1344afd 100644
--- a/gcc/testsuite/g++.dg/ext/attr-noinline-2.C
+++ b/gcc/testsuite/g++.dg/ext/attr-noinline-2.C
@@ -69,5 +69,5 @@ void test_elim_special_2 (void)
 {
   // Should be inlined.
   fnoinline_always_inline<Special>();
-// { dg-final { scan-tree-dump-not "fnoinline_always_inline<Special> *\\(\\);" optimized" } }
+// { dg-final { scan-tree-dump-not "fnoinline_always_inline<Special> *\\(\\);" "optimized" } }
 }
diff --git a/gcc/testsuite/g++.dg/ext/attr-noinline.C b/gcc/testsuite/g++.dg/ext/attr-noinline.C
index b09037bd1a5..54f69d580ea 100644
--- a/gcc/testsuite/g++.dg/ext/attr-noinline.C
+++ b/gcc/testsuite/g++.dg/ext/attr-noinline.C
@@ -94,7 +94,7 @@ void test_keep_primary_3 (void)
 void test_elim_special_3 (void)
 {
   fnone_always_inline<Special>();
-// { dg-final { scan-tree-dump-not "fnone_always_inline<Special> *\\(\\);" optimized" } }
+// { dg-final { scan-tree-dump-not "fnone_always_inline<Special> *\\(\\);" "optimized" } }
 }
 
 
@@ -124,5 +124,5 @@ void test_keep_primary_4 (void)
 void test_elim_special_4 (void)
 {
   fnoinline_always_inline<Special>();
-// { dg-final { scan-tree-dump-not "fnoinline_always_inline<Special> *\\(\\);" optimized" } }
+// { dg-final { scan-tree-dump-not "fnoinline_always_inline<Special> *\\(\\);" "optimized" } }
 }
diff --git a/gcc/testsuite/g++.dg/ext/attr-nonnull.C b/gcc/testsuite/g++.dg/ext/attr-nonnull.C
index 57d2cb025f9..5ef754ee377 100644
--- a/gcc/testsuite/g++.dg/ext/attr-nonnull.C
+++ b/gcc/testsuite/g++.dg/ext/attr-nonnull.C
@@ -4,7 +4,7 @@
 // does not "inherit" attribute nonnull from an argument declared with
 // one in the primary template.
 // { dg-do compile }
-// { dg-options "-O -Wall -fdump-tree-optimized" }
+// { dg-options "-O -Wall" }
 
 template <class T>
 void __attribute__ ((nonnull (1)))
diff --git a/gcc/testsuite/g++.dg/ext/attr-noreturn-2.C b/gcc/testsuite/g++.dg/ext/attr-noreturn-2.C
index cf70ba11349..b35245cc9cc 100644
--- a/gcc/testsuite/g++.dg/ext/attr-noreturn-2.C
+++ b/gcc/testsuite/g++.dg/ext/attr-noreturn-2.C
@@ -3,7 +3,7 @@
     Test to verify that attributes noreturn on multiple declarations of
     the same function are merged.
     { dg-do compile }
-    { dg-options "-O -fdump-tree-eh" } */
+    { dg-options "-O -fdump-tree-optimized" } */
 
 int __attribute__ ((noreturn)) fnoreturn ();
 
diff --git a/gcc/testsuite/g++.dg/ext/attr-warning.C b/gcc/testsuite/g++.dg/ext/attr-warning.C
index 8369bac51d9..6478efa8b83 100644
--- a/gcc/testsuite/g++.dg/ext/attr-warning.C
+++ b/gcc/testsuite/g++.dg/ext/attr-warning.C
@@ -4,7 +4,7 @@
 // "inherit" attribute warning from a primary template declared with
 // it.
 // { dg-do compile }
-// { dg-options "-Wall -fdump-tree-optimized" }
+// { dg-options "-Wall" }
 
 struct Special;
 
-- 
2.30.2