/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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@233339 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3c2858423d332efa5a477839ea21282af70f5989..7a80565e0591fecb064b6e3108bfa0af17aeb02b 100644 (file)
--- 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 c7ba33b7ea15fcf842d55a001b84ec8e61b88982..1689735b41a6955f7764227326701d1a30e651d0 100644 (file)
--- 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 (file)
index 0000000..64572e5
--- /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" }