diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2005-04-17 03:43:01 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2005-04-17 03:43:01 +0000 |
| commit | 79bb956ed03bd2d6b20414c98dbfc28f7a397436 (patch) | |
| tree | e23eef57589c8ba91faf6477714d376dd099eb9f | |
| parent | 2f3580376486a962824b45a2309c6c572f92997b (diff) | |
| download | gcc-79bb956ed03bd2d6b20414c98dbfc28f7a397436.zip gcc-79bb956ed03bd2d6b20414c98dbfc28f7a397436.tar.gz gcc-79bb956ed03bd2d6b20414c98dbfc28f7a397436.tar.bz2 | |
re PR c++/21025 (ICE on template)
PR c++/21025
* typeck.c (cxx_sizeof_or_alignof_type): Check whether the type to
which sizeof/alignof is dependent, rather than just whether we are
processing_template_decl.
PR c++/21025
* g++.dg/template/sizeof9.C: New test.
From-SVN: r98252
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/sizeof9.C | 6 |
4 files changed, 21 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 739f993..81e75b9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2005-04-16 Mark Mitchell <mark@codesourcery.com> + + PR c++/21025 + * typeck.c (cxx_sizeof_or_alignof_type): Check whether the type to + which sizeof/alignof is dependent, rather than just whether we are + processing_template_decl. + 2005-04-17 Kazu Hirata <kazu@cs.umass.edu> * cp-tree.h (LOOKUP_GLOBAL): Remove. diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 272dc86..6ccffe1 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -1221,7 +1221,7 @@ cxx_sizeof_or_alignof_type (tree type, enum tree_code op, bool complain) if (type == error_mark_node) return error_mark_node; - if (processing_template_decl) + if (dependent_type_p (type)) { value = build_min (op, size_type_node, type); TREE_READONLY (value) = 1; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9b5b6e1..f9b274d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2005-04-16 Mark Mitchell <mark@codesourcery.com> + + PR c++/21025 + * typeck.c (cxx_sizeof_or_alignof_type): Check whether the type to + which sizeof/alignof is dependent, rather than just whether we are + processing_template_decl. + 2005-04-15 Thomas Koenig <Thomas.Koenig@online.de> * gfortran.fortran-torture/execute/intrinsic_spread.f90: diff --git a/gcc/testsuite/g++.dg/template/sizeof9.C b/gcc/testsuite/g++.dg/template/sizeof9.C new file mode 100644 index 0000000..8d9ec95 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/sizeof9.C @@ -0,0 +1,6 @@ +// PR c++/21025 + +template<int N> struct X { char x[N]; }; +template<typename T> X<1 + sizeof(T) - sizeof(T)> F(T const &); +template<int N> struct S { int d() { F(1); } }; + |