re GNATS gcj/310 (illegal type "long" accepted for "switch" expression)

	* parse.y (patch_switch_statement): Disallow `long' in switch
	expressions.  Fixes PR gcj/310.

From-SVN: r35819

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 99578ff..805b4b9 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-09  Tom Tromey  <tromey@cygnus.com>
+
+       * parse.y (patch_switch_statement): Disallow `long' in switch
+       expressions.  Fixes PR gcj/310.
+
 2000-08-15  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 
        * decl.c (finit_leg_identifier_node): New global.

diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 56edc6c..514ecbb 100644 (file)
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -14413,7 +14413,7 @@ patch_switch_statement (node)
   se_type = TREE_TYPE (se);
   /* The type of the switch expression must be char, byte, short or
      int */
-  if (!JINTEGRAL_TYPE_P (se_type))
+  if (! JINTEGRAL_TYPE_P (se_type) || se_type == long_type_node)
     {
       EXPR_WFL_LINECOL (wfl_operator) = EXPR_WFL_LINECOL (node);
       parse_error_context (wfl_operator,