diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-06 19:52:39 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-06 19:52:39 +0000 |
| commit | a26202386fdf96c951efefd4809f00cc267b3779 (patch) | |
| tree | b73630ddbd299c29d5c1d121f23b1a0ac0a629cc | |
| parent | 91cbcf37d258442e793d8603064b0a2d8bbc280f (diff) | |
| download | ppe42-gcc-a26202386fdf96c951efefd4809f00cc267b3779.tar.gz ppe42-gcc-a26202386fdf96c951efefd4809f00cc267b3779.zip | |
PR c++/51430
* pt.c (tsubst_decl): Don't call strip_array_domain on
error_mark_node.
* g++.dg/template/static32.C: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182063 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/static32.C | 9 |
4 files changed, 23 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f979af5999f..defc0a5eb44 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-12-06 Jakub Jelinek <jakub@redhat.com> + + PR c++/51430 + * pt.c (tsubst_decl): Don't call strip_array_domain on + error_mark_node. + 2011-12-06 Paolo Carlini <paolo.carlini@oracle.com> PR c++/51431 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 15ef7a0caea..7603c1151e5 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -10622,7 +10622,9 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain) type = DECL_ORIGINAL_TYPE (t); else type = TREE_TYPE (t); - if (TREE_CODE (t) == VAR_DECL && VAR_HAD_UNKNOWN_BOUND (t)) + if (TREE_CODE (t) == VAR_DECL + && VAR_HAD_UNKNOWN_BOUND (t) + && type != error_mark_node) type = strip_array_domain (type); type = tsubst (type, args, complain, in_decl); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2353dd9ea7a..507f9dff47c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-12-06 Jakub Jelinek <jakub@redhat.com> + + PR c++/51430 + * g++.dg/template/static32.C: New test. + 2011-12-06 Uros Bizjak <ubizjak@gmail.com> * g++.dg/opt/pr51396.C: Use dg-additional-options. diff --git a/gcc/testsuite/g++.dg/template/static32.C b/gcc/testsuite/g++.dg/template/static32.C new file mode 100644 index 00000000000..b17d14dd0be --- /dev/null +++ b/gcc/testsuite/g++.dg/template/static32.C @@ -0,0 +1,9 @@ +// PR c++/51430 +// { dg-do compile } + +template<int> struct A +{ + static const int x[] = 0; // { dg-error "in-class initialization|initializer fails" } +}; + +A<0> a; |
