diff options
author | Jakub Jelinek <jakub@redhat.com> | 2008-11-17 07:55:52 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2008-11-17 07:55:52 +0000 |
commit | b4d30c78d3880ce3f54d382962b14ac2923488d8 (patch) | |
tree | eca721f5a076e4b589c4b5ee179ccd06c17325d4 | |
parent | 2285e7b7daeb957ebcf00d1a9d15b61111d2a3e5 (diff) |
PR c++/36089
* init.c (constant_value_1): Handle TREE_LIST init.
* g++.dg/template/init8.C: New test.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@141941 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/cp/init.c | 9 | ||||
-rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/template/init8.C | 68 |
4 files changed, 87 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e6fbdfbd291..f1840285b5c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2008-11-17 Jakub Jelinek <jakub@redhat.com> + + PR c++/36089 + * init.c (constant_value_1): Handle TREE_LIST init. + 2008-11-15 Jakub Jelinek <jakub@redhat.com> PR c++/37561 diff --git a/gcc/cp/init.c b/gcc/cp/init.c index d68dd2d5362..61c78e11f62 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -1659,6 +1659,15 @@ constant_value_1 (tree decl, bool integral_p) } if (init == error_mark_node) return decl; + /* Initializers in templates are generally expanded during + instantiation, so before that for const int i(2) + INIT is a TREE_LIST with the actual initializer as + TREE_VALUE. */ + if (processing_template_decl + && init + && TREE_CODE (init) == TREE_LIST + && TREE_CHAIN (init) == NULL_TREE) + init = TREE_VALUE (init); if (!init || !TREE_TYPE (init) || (integral_p diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ae6939f3341..4520da37021 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-11-17 Jakub Jelinek <jakub@redhat.com> + + PR c++/36089 + * g++.dg/template/init8.C: New test. + 2008-11-16 Mikael Morin <mikael.morin@tele2.fr> PR fortran/35681 diff --git a/gcc/testsuite/g++.dg/template/init8.C b/gcc/testsuite/g++.dg/template/init8.C new file mode 100644 index 00000000000..1bcda1253d1 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/init8.C @@ -0,0 +1,68 @@ +// PR c++/36089 +// { dg-do run } + +extern "C" void abort (); + +int f () +{ + const int c(2); + int d[c] = { 0, 0 }; + return d[0] + sizeof d; +} + +struct A +{ + static int f () + { + const int c(2); + int d[c] = { 0, 0 }; + return d[0] + sizeof d; + } +}; + +template <int> struct B +{ + static int f () + { + const int c = 2; + int d[c] = { 0, 0 }; + return d[0] + sizeof d; + } +}; + +template <int> struct C +{ + static int f () + { + const int c(2); + int d[c] = { 0, 0 }; + return d[0] + sizeof d; + } +}; + +template <int> struct D +{ + static int f () + { + const int e(2); + const int c(e); + int d[c] = { 0, 0 }; + return d[0] + sizeof d; + } +}; + +int +main (void) +{ + int v = f (); + if (v != 2 * sizeof (int)) + abort (); + if (v != A::f ()) + abort (); + if (v != B<6>::f ()) + abort (); + if (v != C<0>::f ()) + abort (); + if (v != D<1>::f ()) + abort (); +} |