diff options
| author | Dodji Seketeli <dodji@redhat.com> | 2011-05-09 12:32:06 +0000 |
|---|---|---|
| committer | Dodji Seketeli <dodji@gcc.gnu.org> | 2011-05-09 14:32:06 +0200 |
| commit | bae14a373cc5e3e80be7f3c312a49c3bdad83c39 (patch) | |
| tree | 072581156222640f0f53f6be03ada70cd67eb374 /gcc | |
| parent | fb55d62e53950f6d269f32fe8c4b279f2263d528 (diff) | |
| download | gcc-bae14a373cc5e3e80be7f3c312a49c3bdad83c39.zip gcc-bae14a373cc5e3e80be7f3c312a49c3bdad83c39.tar.gz gcc-bae14a373cc5e3e80be7f3c312a49c3bdad83c39.tar.bz2 | |
re PR c++/48574 (ICE)
Fix PR c++/48574
gcc/cp/
PR c++/48574
* class.c (fixed_type_or_null): Use type_dependent_p_push to test
if the instance has a dependent initializer.
gcc/testsuite/
PR c++/48574
* g++.dg/template/dependent-expr8.C: New test case.
From-SVN: r173570
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/class.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/dependent-expr8.C | 25 |
4 files changed, 37 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index be4d65a..9bd20b1 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-05-09 Dodji Seketeli <dodji@redhat.com> + + PR c++/48574 + * class.c (fixed_type_or_null): Use type_dependent_p_push to test + if the instance has a dependent initializer. + 2011-05-08 Paolo Carlini <paolo.carlini@oracle.com> PR c++/48816 diff --git a/gcc/cp/class.c b/gcc/cp/class.c index a67b34a..6b08a03 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -5939,7 +5939,7 @@ fixed_type_or_null (tree instance, int *nonnull, int *cdtorp) itself. */ if (TREE_CODE (instance) == VAR_DECL && DECL_INITIAL (instance) - && !type_dependent_expression_p (DECL_INITIAL (instance)) + && !type_dependent_expression_p_push (DECL_INITIAL (instance)) && !htab_find (ht, instance)) { tree type; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 735ac68..b15dba9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-05-09 Dodji Seketeli <dodji@redhat.com> + + PR c++/48574 + * g++.dg/template/dependent-expr8.C: New test case. + 2011-05-07 Zdenek Dvorak <ook@ucw.cz> PR tree-optimization/48837 diff --git a/gcc/testsuite/g++.dg/template/dependent-expr8.C b/gcc/testsuite/g++.dg/template/dependent-expr8.C new file mode 100644 index 0000000..20014d6 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/dependent-expr8.C @@ -0,0 +1,25 @@ +// Origin PR c++/48574 +// { dg-options "-std=c++0x" } +// { dg-do compile } + +struct A +{ + virtual int foo(); +}; + +void baz (int); + +template <typename T> +void +bar(T x) +{ + A &b = *x; + baz (b.foo ()); +} + +void +foo() +{ + A a; + bar(&a); +} |