From: tromey Date: Wed, 6 Nov 2002 00:01:01 +0000 (+0000) Subject: Fix for PR java/6388. X-Git-Tag: upstream/4.9.2~83548 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0bfb37bc56211bfc243390df14ab06955bc869cd;p=platform%2Fupstream%2Flinaro-gcc.git Fix for PR java/6388. * lex.h (JAVA_INTEGRAL_RANGE_ERROR): Wrap in do...while. * java-tree.h (enum java_tree_index): New values JTI_DECIMAL_INT_MAX_NODE, JTI_DECIMAL_LONG_MAX_NODE. (decimal_int_max, decimal_long_max): New defines. * lex.c (yylex): Rewrote range checking. Sign extend literals. (error_if_numeric_overflow): Rewrote range checking. * decl.c (java_init_decl_processing): Initialize decimal_int_max, decimal_long_max. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@58843 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 4efb299..4b1ee3e 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,15 @@ +2002-11-05 Tom Tromey + + Fix for PR java/6388. + * lex.h (JAVA_INTEGRAL_RANGE_ERROR): Wrap in do...while. + * java-tree.h (enum java_tree_index): New values + JTI_DECIMAL_INT_MAX_NODE, JTI_DECIMAL_LONG_MAX_NODE. + (decimal_int_max, decimal_long_max): New defines. + * lex.c (yylex): Rewrote range checking. Sign extend literals. + (error_if_numeric_overflow): Rewrote range checking. + * decl.c (java_init_decl_processing): Initialize decimal_int_max, + decimal_long_max. + 2002-11-02 Tom Tromey * java-tree.h: Move JV_STATE_ERROR before JV_STATE_DONE. diff --git a/gcc/java/decl.c b/gcc/java/decl.c index 4b06aaf..3d3665b 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -1,6 +1,6 @@ /* Process declarations and variables for the GNU compiler for the Java(TM) language. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU CC. @@ -454,6 +454,20 @@ java_init_decl_processing () integer_four_node = build_int_2 (4, 0); integer_minus_one_node = build_int_2 (-1, -1); + /* A few values used for range checking in the lexer. */ + decimal_int_max = build_int_2 (0x80000000, 0); + TREE_TYPE (decimal_int_max) = unsigned_int_type_node; +#if HOST_BITS_PER_WIDE_INT == 64 + decimal_long_max = build_int_2 (0x8000000000000000, 0); +#else +#if HOST_BITS_PER_WIDE_INT == 32 + decimal_long_max = build_int_2 (0, 0x80000000); +#else + #error "unsupported size" +#endif +#endif + TREE_TYPE (decimal_long_max) = unsigned_long_type_node; + size_zero_node = size_int (0); size_one_node = size_int (1); bitsize_zero_node = bitsize_int (0); diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h index bb355fa..051e41b 100644 --- a/gcc/java/java-tree.h +++ b/gcc/java/java-tree.h @@ -275,6 +275,9 @@ enum java_tree_index JTI_UNSIGNED_INT_TYPE_NODE, JTI_UNSIGNED_LONG_TYPE_NODE, + JTI_DECIMAL_INT_MAX_NODE, + JTI_DECIMAL_LONG_MAX_NODE, + JTI_BOOLEAN_TYPE_NODE, JTI_OBJECT_TYPE_NODE, @@ -441,6 +444,11 @@ extern GTY(()) tree java_global_trees[JTI_MAX]; #define unsigned_long_type_node \ java_global_trees[JTI_UNSIGNED_LONG_TYPE_NODE] +#define decimal_int_max \ + java_global_trees[JTI_DECIMAL_INT_MAX_NODE] +#define decimal_long_max \ + java_global_trees[JTI_DECIMAL_LONG_MAX_NODE] + #define boolean_type_node \ java_global_trees[JTI_BOOLEAN_TYPE_NODE] diff --git a/gcc/java/lex.c b/gcc/java/lex.c index d690176..6c7866c 100644 --- a/gcc/java/lex.c +++ b/gcc/java/lex.c @@ -1218,34 +1218,35 @@ java_lex (java_lval) } /* End borrowed section. */ +#ifndef JC1_LITE /* Range checking. */ - if (long_suffix) + value = build_int_2 (low, high); + /* Temporarily set type to unsigned. */ + SET_LVAL_NODE_TYPE (value, (long_suffix + ? unsigned_long_type_node + : unsigned_int_type_node)); + + /* For base 10 numbers, only values up to the highest value + (plus one) can be written. For instance, only ints up to + 2147483648 can be written. The special case of the largest + negative value is handled elsewhere. For other bases, any + number can be represented. */ + if (overflow || (radix == 10 + && tree_int_cst_lt (long_suffix + ? decimal_long_max + : decimal_int_max, + value))) { - /* 9223372036854775808L is valid if operand of a '-'. Otherwise - 9223372036854775807L is the biggest `long' literal that can be - expressed using a 10 radix. For other radices, everything that - fits withing 64 bits is OK. */ - int hb = (high >> 31); - if (overflow || (hb && low && radix == 10) - || (hb && high & 0x7fffffff && radix == 10)) + if (long_suffix) JAVA_INTEGRAL_RANGE_ERROR ("Numeric overflow for `long' literal"); - } - else - { - /* 2147483648 is valid if operand of a '-'. Otherwise, - 2147483647 is the biggest `int' literal that can be - expressed using a 10 radix. For other radices, everything - that fits within 32 bits is OK. As all literals are - signed, we sign extend here. */ - int hb = (low >> 31) & 0x1; - if (overflow || high || (hb && low & 0x7fffffff && radix == 10)) + else JAVA_INTEGRAL_RANGE_ERROR ("Numeric overflow for `int' literal"); - high = -hb; } -#ifndef JC1_LITE - value = build_int_2 (low, high); + + /* Sign extend the value. */ + SET_LVAL_NODE_TYPE (value, (long_suffix ? long_type_node : int_type_node)); + force_fit_type (value, 0); JAVA_RADIX10_FLAG (value) = radix == 10; - SET_LVAL_NODE_TYPE (value, long_suffix ? long_type_node : int_type_node); #else SET_LVAL_NODE_TYPE (build_int_2 (low, high), long_suffix ? long_type_node : int_type_node); @@ -1661,24 +1662,14 @@ static void error_if_numeric_overflow (value) tree value; { - if (TREE_CODE (value) == INTEGER_CST && JAVA_RADIX10_FLAG (value)) + if (TREE_CODE (value) == INTEGER_CST + && JAVA_RADIX10_FLAG (value) + && tree_int_cst_sgn (value) < 0) { - unsigned HOST_WIDE_INT lo, hi; - - lo = TREE_INT_CST_LOW (value); - hi = TREE_INT_CST_HIGH (value); if (TREE_TYPE (value) == long_type_node) - { - int hb = (hi >> 31); - if (hb && !(hi & 0x7fffffff)) - java_lex_error ("Numeric overflow for `long' literal", 0); - } + java_lex_error ("Numeric overflow for `long' literal", 0); else - { - int hb = (lo >> 31) & 0x1; - if (hb && !(lo & 0x7fffffff)) - java_lex_error ("Numeric overflow for `int' literal", 0); - } + java_lex_error ("Numeric overflow for `int' literal", 0); } } #endif /* JC1_LITE */ diff --git a/gcc/java/lex.h b/gcc/java/lex.h index a458926..e79d7ee 100644 --- a/gcc/java/lex.h +++ b/gcc/java/lex.h @@ -1,5 +1,5 @@ /* Language lexer definitions for the GNU compiler for the Java(TM) language. - Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. Contributed by Alexandre Petit-Bianco (apbianco@cygnus.com) This file is part of GNU CC. @@ -185,7 +185,7 @@ extern void java_destroy_lexer PARAMS ((java_lexer *)); #define SET_LVAL_NODE_TYPE(NODE, TYPE) #define BUILD_ID_WFL(EXP) (EXP) #define JAVA_FLOAT_RANGE_ERROR(S) {} -#define JAVA_INTEGRAL_RANGE_ERROR(S) {} +#define JAVA_INTEGRAL_RANGE_ERROR(S) do { } while (0) #else @@ -237,12 +237,12 @@ extern void java_destroy_lexer PARAMS ((java_lexer *)); ctxp->c_line->current = i; \ } #define JAVA_INTEGRAL_RANGE_ERROR(m) \ - { \ + do { \ int i = ctxp->c_line->current; \ ctxp->c_line->current = number_beginning; \ java_lex_error (m, 0); \ ctxp->c_line->current = i; \ - } + } while (0) #endif /* Definitions for jc1 compilation only */