diff options
| author | Jason Merrill <jason@redhat.com> | 2011-03-29 22:16:22 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-03-29 22:16:22 -0400 |
| commit | 5453bbef09e7c3afb3aa0227e99d225d055f90cb (patch) | |
| tree | 344a415d9fb4d0e3b55bb77e4e7d3a3466f04a17 /gcc | |
| parent | ad3b266ba5b48f3ce496a387a751c411a6a40cd6 (diff) | |
| download | gcc-5453bbef09e7c3afb3aa0227e99d225d055f90cb.zip gcc-5453bbef09e7c3afb3aa0227e99d225d055f90cb.tar.gz gcc-5453bbef09e7c3afb3aa0227e99d225d055f90cb.tar.bz2 | |
re PR c++/48265 ([C++0x] ICE: SIGSEGV (recursion in value_dependent_expression_p) when variable is used uninitialised)
PR c++/48265
* pt.c (value_dependent_expression_p) [VAR_DECL]: Make sure
the variable is constant before looking at its initializer.
From-SVN: r171714
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/regress/value-dep1.C | 7 |
4 files changed, 17 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c4df48d..8558446 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2011-03-29 Jason Merrill <jason@redhat.com> + PR c++/48265 + * pt.c (value_dependent_expression_p) [VAR_DECL]: Make sure + the variable is constant before looking at its initializer. + PR c++/48319 * pt.c (value_dependent_expression_p): Handle TEMPLATE_ID_EXPR. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index aa0901b..5960e46 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -18085,10 +18085,10 @@ value_dependent_expression_p (tree expression) return value_dependent_expression_p (DECL_INITIAL (expression)); case VAR_DECL: - /* A constant with integral or enumeration type and is initialized + /* A constant with literal type and is initialized with an expression that is value-dependent. */ if (DECL_INITIAL (expression) - && INTEGRAL_OR_ENUMERATION_TYPE_P (TREE_TYPE (expression)) + && decl_constant_var_p (expression) && value_dependent_expression_p (DECL_INITIAL (expression))) return true; return false; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 48199a2..ede28b2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-03-29 Jason Merrill <jason@redhat.com> + + * g++.dg/cpp0x/regress/value-dep1.C: New. + 2011-03-29 Steve Ellcey <sje@cup.hp.com> * gcc.dg/torture/pr47917.c: Use -std=gnu99 on HP-UX. diff --git a/gcc/testsuite/g++.dg/cpp0x/regress/value-dep1.C b/gcc/testsuite/g++.dg/cpp0x/regress/value-dep1.C new file mode 100644 index 0000000..112389d --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/regress/value-dep1.C @@ -0,0 +1,7 @@ +// PR c++/48265 +// { dg-options -std=c++0x } + +template < int > struct S +{ + S () { const int i = i; i; }; +}; |