re PR c++/71450 (ICE on invalid C++11 code on x86_64-linux-gnu: in tree check: expect...

	PR c++/71450
	* pt.c (tsubst_copy): Return error_mark_node when mark_used
	fails, even when complain & tf_error.

	* g++.dg/cpp0x/pr71450-1.C: New test.
	* g++.dg/cpp0x/pr71450-2.C: New test.

From-SVN: r242767

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 66ea957e1b7c5bd1e82580a0191afae83bb66db8..7418b22498b96fb470be100ce115edf218105a30 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2016-11-23  Jakub Jelinek  <jakub@redhat.com>
 
+       PR c++/71450
+       * pt.c (tsubst_copy): Return error_mark_node when mark_used
+       fails, even when complain & tf_error.
+
        PR c++/77739
        * cp-gimplify.c (cp_gimplify_tree) <case VEC_INIT_EXPR>: Pass
        false as handle_invisiref_parm_p to cp_genericize_tree.

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 6a68de24bbb11a8d0c924d900fa3506d549d5ce2..8b0a21cb2b2ff64ba7f1c5c002d1eefc71d7decb 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -14297,7 +14297,7 @@ tsubst_copy (tree t, tree args, tsubst_flags_t complain, tree in_decl)
        }
       else
        r = t;
-      if (!mark_used (r, complain) && !(complain & tf_error))
+      if (!mark_used (r, complain))
        return error_mark_node;
       return r;
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ca673eea1da0bc5a0d74ba949e35b0061566dba1..6abbd3b43788c86d5c4411cef2270b0aea951684 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2016-11-23  Jakub Jelinek  <jakub@redhat.com>
 
+       PR c++/71450
+       * g++.dg/cpp0x/pr71450-1.C: New test.
+       * g++.dg/cpp0x/pr71450-2.C: New test.
+
        PR c++/77739
        * g++.dg/cpp1y/pr77739.C: New test.
 

diff --git a/gcc/testsuite/g++.dg/cpp0x/pr71450-1.C b/gcc/testsuite/g++.dg/cpp0x/pr71450-1.C
new file mode 100644 (file)
index 0000000..1c68629
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/pr71450-1.C
@@ -0,0 +1,16 @@
+// PR c++/71450
+// { dg-do compile { target c++11 } }
+
+struct A { A operator+ (A a) { return a; } };
+
+template <class T>
+void foo (T t)
+{ 
+  auto x = t + x;      // { dg-error "use of 'x' before deduction of 'auto'" }
+}
+
+int
+main ()
+{ 
+  foo (A ());
+}

diff --git a/gcc/testsuite/g++.dg/cpp0x/pr71450-2.C b/gcc/testsuite/g++.dg/cpp0x/pr71450-2.C
new file mode 100644 (file)
index 0000000..1a7376c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/pr71450-2.C
@@ -0,0 +1,14 @@
+// PR c++/71450
+// { dg-do compile { target c++11 } }
+
+template <class T>
+void foo (T t)
+{ 
+  auto x = t + x;      // { dg-error "use of 'x' before deduction of 'auto'" }
+}
+
+int
+main ()
+{ 
+  foo (1);
+}