diff options
| author | Jason Merrill <jason@redhat.com> | 2011-06-09 23:56:08 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-06-09 23:56:08 -0400 |
| commit | 793fbf0b4857056c5723a5e2b9fc20c3726726c5 (patch) | |
| tree | cec6f934c5272457884f62365f6a20071d4ea789 | |
| parent | 377a5364302b126840da543d6acf46b68e59a486 (diff) | |
| download | gcc-793fbf0b4857056c5723a5e2b9fc20c3726726c5.zip gcc-793fbf0b4857056c5723a5e2b9fc20c3726726c5.tar.gz gcc-793fbf0b4857056c5723a5e2b9fc20c3726726c5.tar.bz2 | |
* semantics.c (maybe_constant_value): Handle overflowed input.
From-SVN: r174885
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 12 | ||||
| -rw-r--r-- | libstdc++-v3/ChangeLog | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/ratio/cons/cons_overflow_neg.cc | 3 |
4 files changed, 17 insertions, 3 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 diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c8d33b1..1ad5db4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,7 @@ 2011-06-09 Jason Merrill <jason@redhat.com> + * testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Adjust. + * testsuite/lib/prune.exp (libstdc++-dg-prune): Prune notes. * testsuite/20_util/duration/cons/1_neg.cc: Remove dg-excess-errors. * testsuite/20_util/duration/requirements/typedefs_neg2.cc: Likewise. diff --git a/libstdc++-v3/testsuite/20_util/ratio/cons/cons_overflow_neg.cc b/libstdc++-v3/testsuite/20_util/ratio/cons/cons_overflow_neg.cc index 83f5ce1..8aa72f2 100644 --- a/libstdc++-v3/testsuite/20_util/ratio/cons/cons_overflow_neg.cc +++ b/libstdc++-v3/testsuite/20_util/ratio/cons/cons_overflow_neg.cc @@ -51,4 +51,5 @@ test04() // { dg-error "required from here" "" { target *-*-* } 46 } // { dg-error "denominator cannot be zero" "" { target *-*-* } 268 } // { dg-error "out of range" "" { target *-*-* } 269 } -// { dg-error "overflow in constant expression" "" { target *-*-* } 109 } +// { dg-error "overflow in constant expression" "" { target *-*-* } 61 } +// { dg-prune-output "not a member" } |