aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/class.c
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2011-11-09 13:13:09 -0500
committerJason Merrill <jason@gcc.gnu.org>2011-11-09 13:13:09 -0500
commit816d91522e7bb771eb1f6faf79db27684bc9675c (patch)
treeba73ea5a7f12410d93622a13f3dc9e09ca4667d2 /gcc/cp/class.c
parent4bdd090f8e0becf7191967e920aa1c9f9b796d1b (diff)
downloadgcc-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/cp/class.c')
-rw-r--r--gcc/cp/class.c5
1 files changed, 5 insertions, 0 deletions
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