From 0d7d945855a7d55e165009a71907edcd6a2da77c Mon Sep 17 00:00:00 2001
From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Thu, 11 Feb 2016 11:44:51 +0000
Subject: [PATCH] re PR c++/68726 (ice: tree check: expected tree_vec, have
 error_mark in comp_template_args_with_info, at cp/pt.c:7890)

/cp
2016-02-11  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/68726
	* pt.c (lookup_template_class_1): Check tsubst return value for
	error_mark_node.

/testsuite
2016-02-11  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/68726
	* g++.dg/cpp0x/pr68726.C: New.

From-SVN: r233339
---
 gcc/cp/ChangeLog                     | 6 ++++++
 gcc/testsuite/ChangeLog              | 5 +++++
 gcc/testsuite/g++.dg/cpp0x/pr68726.C | 7 +++++++
 3 files changed, 18 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/pr68726.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3c2858423d33..7a80565e0591 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2016-02-11  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/68726
+	* pt.c (lookup_template_class_1): Check tsubst return value for
+	error_mark_node.
+
 2016-02-10  Jason Merrill  <jason@redhat.com>
 
 	PR c++/68926
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c7ba33b7ea15..1689735b41a6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-11  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/68726
+	* g++.dg/cpp0x/pr68726.C: New.
+
 2016-02-11  Ilya Enkovich  <enkovich.gnu@gmail.com>
 
 	* lib/mpx-dg.exp: Fix warning in check_effective_target_mpx
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr68726.C b/gcc/testsuite/g++.dg/cpp0x/pr68726.C
new file mode 100644
index 000000000000..64572e5ee463
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/pr68726.C
@@ -0,0 +1,7 @@
+// { dg-do compile { target c++11 } }
+
+template <typename> struct A {
+  template <typename, > struct __construct_helper;  // { dg-error "expected" }
+  template <typename... _Args>
+  using __has_construct typename __construct_helper<_Args...>::type;  // { dg-error "expected" }
+} struct : A<int> {  // { dg-error "expected" }