From cd2ba456af4afec9fb3f45a4af67fddaf15c43d9 Mon Sep 17 00:00:00 2001
From: reichelt <reichelt@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 15 May 2006 09:34:59 +0000
Subject: [PATCH] PR c++/27582 * pt.c
(any_dependent_template_arguments_p): Return early on invalid argument list.
* g++.dg/template/dependent-args1.C: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113784 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/cp/ChangeLog | 4 ++++
gcc/cp/pt.c | 2 ++
gcc/testsuite/ChangeLog | 3 +++
gcc/testsuite/g++.dg/template/dependent-args1.C | 11 +++++++++++
4 files changed, 20 insertions(+)
create mode 100644 gcc/testsuite/g++.dg/template/dependent-args1.C
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 84431385e5ca..0d6295327c35 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
2006-05-15 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
+ PR c++/27582
+ * pt.c (any_dependent_template_arguments_p): Return early on invalid
+ argument list.
+
PR c++/27581
* search.c (adjust_result_of_qualified_name_lookup): Skip on
invalid context_class.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index cf0e7cd4f9a0..7bbc2cc972fd 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -12760,6 +12760,8 @@ any_dependent_template_arguments_p (tree args)
if (!args)
return false;
+ if (args == error_mark_node)
+ return true;
for (i = 0; i < TMPL_ARGS_DEPTH (args); ++i)
{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1dbb9239be74..dd39f3512cdc 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
2006-05-15 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
+ PR c++/27582
+ * g++.dg/template/dependent-args1.C: New test.
+
PR c++/27581
* g++.dg/lookup/this1.C: New test.
diff --git a/gcc/testsuite/g++.dg/template/dependent-args1.C b/gcc/testsuite/g++.dg/template/dependent-args1.C
new file mode 100644
index 000000000000..0b197cf555e9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/dependent-args1.C
@@ -0,0 +1,11 @@
+// PR c++/27582
+// { dg-do compile }
+
+struct A
+{
+ template<int> void foo();
+};
+
+template<int N, void (A::*)() = &A::foo<N> > struct B {};
+
+B<int> b; // { dg-error "type/value mismatch|expected a constant|invalid type" }
--
GitLab