OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* semantics.c (maybe_constant_value): Handle overflowed input. 

From-SVN: r174885
This commit is contained in:
Jason Merrill 2011-06-09 23:56:08 -04:00 committed by Jason Merrill
parent 377a536430
commit 793fbf0b48
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/cp/ChangeLog
View File

@ -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

12
gcc/cp/semantics.c
View File

@ -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

2
libstdc++-v3/ChangeLog
View File

@ -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.

3
libstdc++-v3/testsuite/20_util/ratio/cons/cons_overflow_neg.cc
View File

@ -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" }