diff options
| author | Lee Millward <lee.millward@codesourcery.com> | 2006-08-15 17:21:09 +0000 |
|---|---|---|
| committer | Lee Millward <lmillward@gcc.gnu.org> | 2006-08-15 17:21:09 +0000 |
| commit | d47e3adf1d1100661aa25c0668575c649a690b4a (patch) | |
| tree | 6f94e361b433416c5300723a2b281d3b4f0daf3e /gcc | |
| parent | b0faa35c0ffce50dce634a21a4997dfd08a74e32 (diff) | |
| download | gcc-d47e3adf1d1100661aa25c0668575c649a690b4a.zip gcc-d47e3adf1d1100661aa25c0668575c649a690b4a.tar.gz gcc-d47e3adf1d1100661aa25c0668575c649a690b4a.tar.bz2 | |
re PR c++/28594 (ICE with invalid template parameter)
PR c++/28594
* pt.c (process_template_parm): Robustify.
* g++.dg/template/void6.C: New test.
From-SVN: r116160
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 17 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/void6.C | 3 |
4 files changed, 24 insertions, 6 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9194192..53efac9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2006-08-15 Lee Millward <lee.millward@codesourcery.com> + + PR c++/28594 + * pt.c (process_template_parm): Robustify. + 2006-08-14 Steve Ellcey <sje@cup.hp.com> PR c++/28288 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index c744759..4c2b45a 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -2352,19 +2352,24 @@ process_template_parm (tree list, tree parm, bool is_non_type) { tree decl = 0; tree defval; - int idx; + int idx = 0; gcc_assert (TREE_CODE (parm) == TREE_LIST); defval = TREE_PURPOSE (parm); if (list) { - tree p = TREE_VALUE (tree_last (list)); + tree p = tree_last (list); + + if (p && p != error_mark_node) + { + p = TREE_VALUE (p); + if (TREE_CODE (p) == TYPE_DECL || TREE_CODE (p) == TEMPLATE_DECL) + idx = TEMPLATE_TYPE_IDX (TREE_TYPE (p)); + else + idx = TEMPLATE_PARM_IDX (DECL_INITIAL (p)); + } - if (TREE_CODE (p) == TYPE_DECL || TREE_CODE (p) == TEMPLATE_DECL) - idx = TEMPLATE_TYPE_IDX (TREE_TYPE (p)); - else - idx = TEMPLATE_PARM_IDX (DECL_INITIAL (p)); ++idx; } else diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d887699..030212f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-08-15 Lee Millward <lee.millward@codesourcery.com> + + PR c++/28594 + * g++.dg/template/void6.C: New test. + 2006-08-15 Volker Reichelt <reichelt@igpm.rwth-aachen.de> PR c/28649 diff --git a/gcc/testsuite/g++.dg/template/void6.C b/gcc/testsuite/g++.dg/template/void6.C new file mode 100644 index 0000000..2d5f7ea --- /dev/null +++ b/gcc/testsuite/g++.dg/template/void6.C @@ -0,0 +1,3 @@ +//PR c++/28594 + +template<void, int> struct A; // { dg-error "not a valid type" } |