java-tree.h: Remove JTI_INTEGER_NEGATIVE_ONE_NODE.

	* java-tree.h: Remove JTI_INTEGER_NEGATIVE_ONE_NODE.
	* decl.c (init_decl_processing): Use integer_minus_one_node, not
	integer_negative_one_node.
	* expr.c (build_java_binop): Likewise.

From-SVN: r39337

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 387e516..5ff6bde 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,10 @@
+2000-01-30  Bryce McKinlay  <bryce@albatross.co.nz>
+
+       * java-tree.h: Remove JTI_INTEGER_NEGATIVE_ONE_NODE.
+       * decl.c (init_decl_processing): Use integer_minus_one_node, not
+       integer_negative_one_node.
+       * expr.c (build_java_binop): Likewise.
+
 2000-01-24  Jeff Sturm  <jeff.sturm@commerceone.com>
 
        * zextract.c (read_zip_archive): Read file_offset before writing

diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index b11ea6c..a19d06d 100644 (file)
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -473,7 +473,7 @@ init_decl_processing ()
   integer_one_node = build_int_2 (1, 0);
   integer_two_node = build_int_2 (2, 0);
   integer_four_node = build_int_2 (4, 0);
-  integer_negative_one_node = build_int_2 (-1, 0);
+  integer_minus_one_node = build_int_2 (-1, -1);
 
   size_zero_node = size_int (0);
   size_one_node = size_int (1);

diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index beb3137..16653ec 100644 (file)
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -1299,11 +1299,11 @@ build_java_binop (op, type, arg1, arg2)
        tree second_compare = fold (build (COND_EXPR, int_type_node,
                                           ifexp2, integer_zero_node,
                                           op == COMPARE_L_EXPR
-                                          ? integer_negative_one_node
+                                          ? integer_minus_one_node
                                           : integer_one_node));
        return fold (build (COND_EXPR, int_type_node, ifexp1,
                            op == COMPARE_L_EXPR ? integer_one_node
-                           : integer_negative_one_node,
+                           : integer_minus_one_node,
                            second_compare));
       }
     case COMPARE_EXPR:
@@ -1315,7 +1315,7 @@ build_java_binop (op, type, arg1, arg2)
                                            ifexp2, integer_one_node,
                                            integer_zero_node));
        return fold (build (COND_EXPR, int_type_node,
-                           ifexp1, integer_negative_one_node, second_compare));
+                           ifexp1, integer_minus_one_node, second_compare));
       }      
     case TRUNC_DIV_EXPR:
     case TRUNC_MOD_EXPR:

diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h
index 46e8f8a..c390432 100644 (file)
--- a/gcc/java/java-tree.h
+++ b/gcc/java/java-tree.h
@@ -280,7 +280,6 @@ enum java_tree_index
   JTI_LONG_ZERO_NODE,
   JTI_FLOAT_ZERO_NODE,
   JTI_DOUBLE_ZERO_NODE,
-  JTI_INTEGER_NEGATIVE_ONE_NODE,
   JTI_INTEGER_TWO_NODE,
   JTI_INTEGER_FOUR_NODE,
   JTI_EMPTY_STMT_NODE,
@@ -480,8 +479,6 @@ extern tree java_global_trees[JTI_MAX];
   java_global_trees[JTI_FLOAT_ZERO_NODE]
 #define double_zero_node \
   java_global_trees[JTI_DOUBLE_ZERO_NODE]
-#define integer_negative_one_node \
-  java_global_trees[JTI_INTEGER_NEGATIVE_ONE_NODE]
 #define integer_two_node \
   java_global_trees[JTI_INTEGER_TWO_NODE]
 #define integer_four_node \