diff options
| author | Jason Merrill <jason@redhat.com> | 2011-11-09 13:13:09 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-11-09 13:13:09 -0500 |
| commit | 816d91522e7bb771eb1f6faf79db27684bc9675c (patch) | |
| tree | ba73ea5a7f12410d93622a13f3dc9e09ca4667d2 /gcc | |
| parent | 4bdd090f8e0becf7191967e920aa1c9f9b796d1b (diff) | |
| download | gcc-816d91522e7bb771eb1f6faf79db27684bc9675c.zip gcc-816d91522e7bb771eb1f6faf79db27684bc9675c.tar.gz gcc-816d91522e7bb771eb1f6faf79db27684bc9675c.tar.bz2 | |
re PR c++/51029 ([C++0x] [4.7 Regression] ICE with -std=c++0x)
PR c++/51029
* class.c (build_base_path): Don't ICE in fold_non_dependent_expr.
From-SVN: r181225
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/class.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/virtual1.C | 14 |
4 files changed, 27 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index cba11e1..9c5a2bc 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2011-11-09 Jason Merrill <jason@redhat.com> + PR c++/51029 + * class.c (build_base_path): Don't ICE in fold_non_dependent_expr. + * Make-lang.in (check_g++_parallelize): Add dg-torture.exp. (check-c++0x): Obsolete. diff --git a/gcc/cp/class.c b/gcc/cp/class.c index f10a749..d2cf63c 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -359,6 +359,11 @@ build_base_path (enum tree_code code, V_BINFO. That offset is an entry in D_BINFO's vtable. */ tree v_offset; + /* In a constructor template, current_in_charge_parm isn't set, + and we might end up here via fold_non_dependent_expr. */ + if (fixed_type_p < 0 && !(cfun && current_in_charge_parm)) + fixed_type_p = 0; + if (fixed_type_p < 0 && in_base_initializer) { /* In a base member initializer, we cannot rely on the diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cff301e..e4ec7ae 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-11-09 Jason Merrill <jason@redhat.com> + + PR c++/51029 + * g++.dg/template/virtual1.C: New. + 2011-11-08 Jason Merrill <jason@redhat.com> Run most C++ tests in both C++98 and C++11 modes. diff --git a/gcc/testsuite/g++.dg/template/virtual1.C b/gcc/testsuite/g++.dg/template/virtual1.C new file mode 100644 index 0000000..ee86bf3 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/virtual1.C @@ -0,0 +1,14 @@ +// PR c++/51029 + +struct A +{ + void foo(); +}; + +struct B : virtual A +{ + template<int> B() + { + foo(); + } +}; |