diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 12 |
2 files changed, 13 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 377780a..e134c27 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2011-06-09 Jason Merrill <jason@redhat.com> + * semantics.c (maybe_constant_value): Handle overflowed input. + (non_const_var_error): Handle non-constant DECL_INITIAL. + * pt.c (build_non_dependent_expr): Use fold_non_dependent_expr_sfinae. * parser.c (cp_parser_constant_expression): Just return the diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index bf6486b..481318e 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -6902,7 +6902,8 @@ non_const_var_error (tree r) else if (CP_TYPE_VOLATILE_P (type)) inform (DECL_SOURCE_LOCATION (r), "%q#D is volatile", r); - else if (!DECL_INITIAL (r)) + else if (!DECL_INITIAL (r) + || !TREE_CONSTANT (DECL_INITIAL (r))) inform (DECL_SOURCE_LOCATION (r), "%qD was not initialized with a constant " "expression", r); @@ -7337,7 +7338,14 @@ maybe_constant_value (tree t) || type_unknown_p (t) || !potential_constant_expression (t) || value_dependent_expression_p (t)) - return t; + { + if (TREE_OVERFLOW_P (t)) + { + t = build_nop (TREE_TYPE (t), t); + TREE_CONSTANT (t) = false; + } + return t; + } r = cxx_eval_outermost_constant_expr (t, true); #ifdef ENABLE_CHECKING |