From 0bb1600af12451af5f158fc058c35ea02ecd80fb Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Mon, 15 Mar 2004 14:15:09 +0000 Subject: [PATCH] re PR java/14551 (Switch w sign-extended byte and >16 labels causes error in tree.c) 2004-03-12 Andrew Haley PR java/14551 * typeck.c (convert): Clear TREE_OVERFLOW after an integer conversion. From-SVN: r79493 --- gcc/java/ChangeLog | 6 ++++++ gcc/java/typeck.c | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 8b46231..f080725 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2004-03-12 Andrew Haley + + PR java/14551 + * typeck.c (convert): Clear TREE_OVERFLOW after an integer + conversion. + 2004-02-29 Roger Sayle * jcf-parse.c (java_parse_file): Handle the case that input_filename diff --git a/gcc/java/typeck.c b/gcc/java/typeck.c index 7537c6c..d52afd2 100644 --- a/gcc/java/typeck.c +++ b/gcc/java/typeck.c @@ -137,7 +137,14 @@ convert (tree type, tree expr) && TARGET_FLOAT_FORMAT == IEEE_FLOAT_FORMAT) return fold (convert_ieee_real_to_integer (type, expr)); else - return fold (convert_to_integer (type, expr)); + { + /* fold very helpfully sets the overflow status if a type + overflows in a narrowing integer conversion, but Java + doesn't care. */ + tree tmp = fold (convert_to_integer (type, expr)); + TREE_OVERFLOW (tmp) = 0; + return tmp; + } } if (code == REAL_TYPE) return fold (convert_to_real (type, expr)); -- 2.7.4