diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2007-08-31 09:44:54 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2007-08-31 09:44:54 +0000 |
| commit | 5973c7435193750d1ebbeb5753a0b0d480f95fc8 (patch) | |
| tree | 218882e3b28daa70e66a89ef313bf728aa437c9e /gcc | |
| parent | a53bf42c31fe143b6f3079154a772ea1c8b921b0 (diff) | |
| download | gcc-5973c7435193750d1ebbeb5753a0b0d480f95fc8.zip gcc-5973c7435193750d1ebbeb5753a0b0d480f95fc8.tar.gz gcc-5973c7435193750d1ebbeb5753a0b0d480f95fc8.tar.bz2 | |
re PR c++/32113 (ICE with invalid template parameter)
/cp
2007-08-31 Paolo Carlini <pcarlini@suse.de>
PR c++/32113
* search.c (lookup_member): Check the name argument for
error_mark_node.
/testsuite
2007-08-31 Paolo Carlini <pcarlini@suse.de>
PR c++/32113
* g++.dg/template/crash70.C: New.
From-SVN: r127963
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/search.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/crash70.C | 7 |
4 files changed, 21 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9c7adc9..eb81476 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,11 @@ 2007-08-31 Paolo Carlini <pcarlini@suse.de> + PR c++/32113 + * search.c (lookup_member): Check the name argument for + error_mark_node. + +2007-08-31 Paolo Carlini <pcarlini@suse.de> + PR c++/33212 * parser.c (cp_parser_trait_expr): Check rerurn value of cp_parser_type_id. diff --git a/gcc/cp/search.c b/gcc/cp/search.c index d5c57a9..4371eb4 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -1199,6 +1199,9 @@ lookup_member (tree xbasetype, tree name, int protect, bool want_type) const char *errstr = 0; + if (name == error_mark_node) + return NULL_TREE; + gcc_assert (TREE_CODE (name) == IDENTIFIER_NODE); if (TREE_CODE (xbasetype) == TREE_BINFO) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f2d3714..134ea79 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2007-08-31 Paolo Carlini <pcarlini@suse.de> + PR c++/32113 + * g++.dg/template/crash70.C: New. + +2007-08-31 Paolo Carlini <pcarlini@suse.de> + PR c++/33212 * g++.dg/ext/is_class_error.C: New. diff --git a/gcc/testsuite/g++.dg/template/crash70.C b/gcc/testsuite/g++.dg/template/crash70.C new file mode 100644 index 0000000..742f77b --- /dev/null +++ b/gcc/testsuite/g++.dg/template/crash70.C @@ -0,0 +1,7 @@ +// PR c++/32113 + +template<int> struct A; + +template<typename T> void foo (A<&T::template i>); // { dg-error "not a template" } + +template void foo<A<0> > (A<0>); // { dg-error "does not match" } |