aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMark Mitchell <mark@codesourcery.com>2005-01-29 00:47:57 +0000
committerMark Mitchell <mmitchel@gcc.gnu.org>2005-01-29 00:47:57 +0000
commitee921ddf2138f35cae582ef7fa13e22eaa9ece50 (patch)
tree0ad196682cc080d530a01779ae7a98032c00d680 /gcc
parent8f43f502deef1c38af5e1e7ea7e09ce211be2448 (diff)
downloadgcc-ee921ddf2138f35cae582ef7fa13e22eaa9ece50.zip
gcc-ee921ddf2138f35cae582ef7fa13e22eaa9ece50.tar.gz
gcc-ee921ddf2138f35cae582ef7fa13e22eaa9ece50.tar.bz2
re PR c++/19667 (ICE on (very trivial) invalid)
PR c++/19667 * g++.dg/template/crash32.C: New test. PR c++/19667 * pt.c (redeclare_class_template): Robustify. From-SVN: r94402
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/pt.c7
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/template/crash32.C9
4 files changed, 26 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index bb1ac4e..077113c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-28 Mark Mitchell <mark@codesourcery.com>
+
+ PR c++/19667
+ * pt.c (redeclare_class_template): Robustify.
+
2005-01-27 Steven Bosscher <stevenb@suse.de>
* decl.c (finish_case_label): Use SWITCH_STMT accessor macros
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index dc781b4..176e6a3 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -3236,6 +3236,13 @@ redeclare_class_template (tree type, tree parms)
type. */
return;
+ if (!parms)
+ {
+ error ("template specifiers not specified in declaration of %qD",
+ tmpl);
+ return;
+ }
+
parms = INNERMOST_TEMPLATE_PARMS (parms);
tmpl_parms = DECL_INNERMOST_TEMPLATE_PARMS (tmpl);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 647497a..06c06d3 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-28 Mark Mitchell <mark@codesourcery.com>
+
+ PR c++/19667
+ * g++.dg/template/crash32.C: New test.
+
2005-01-28 Ian Lance Taylor <ian@airs.com>
PR middle-end/16558
diff --git a/gcc/testsuite/g++.dg/template/crash32.C b/gcc/testsuite/g++.dg/template/crash32.C
new file mode 100644
index 0000000..a836351
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/crash32.C
@@ -0,0 +1,9 @@
+// PR c++/19667
+
+struct integral_constant { };
+
+template<typename _Tp>
+struct is_function : public integral_constant { }; // { dg-error "previous" }
+
+template<>
+struct is_function : public integral_constant { }; // { dg-error "" }