stmt.c (estimate_case_costs): Use integer_minus_one_node.

	* stmt.c (estimate_case_costs): Use integer_minus_one_node.

	* tree.c (build_common_tree_nodes_2): Set integer_minus_one_node.

	* tree.h (tree_index): Add new element TI_INTEGER_MINUS_ONE.
	(integer_minus_one_node): Define.

ch:
	* ch-tree.h (integer_minus_one_node): Moved to top level gcc
	directory.

	* decl.c (integer_minus_one_node): Likewise.
	(init_decl_processing): Don't set integer_minus_one_node.

cp:
	* cp-tree.h (cp_tree_index): Delete CPTI_MINUS_ONE.
	(minus_one_node): Moved to top level gcc directory.  Renamed
	to integer_minus_one_node.

	* init.c (init_init_processing): Don't set minus_one_node.
	(build_vec_init): Use integer_minus_one_node.

	* rtti.c (get_tinfo_decl_dynamic): Likewise.

From-SVN: r39325

11 files changed, 35 insertions, 17 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 97ddcf9..c0e9722 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2001-01-28  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* stmt.c (estimate_case_costs): Use integer_minus_one_node.
+
+	* tree.c (build_common_tree_nodes_2): Set integer_minus_one_node.
+
+	* tree.h (tree_index): Add new element TI_INTEGER_MINUS_ONE.
+	(integer_minus_one_node): Define.
+
 2001-01-28  Alexandre Oliva  <aoliva@redhat.com>
 
 	* Makefile.in (bootstrap2-lean): Fix typo.
diff --git a/gcc/ch/ChangeLog b/gcc/ch/ChangeLog
index 9aeb102..c3f6809 100644
--- a/gcc/ch/ChangeLog
+++ b/gcc/ch/ChangeLog
@@ -1,3 +1,11 @@
+2001-01-28  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* ch-tree.h (integer_minus_one_node): Moved to top level gcc
+	directory.
+
+	* decl.c (integer_minus_one_node): Likewise.
+	(init_decl_processing): Don't set integer_minus_one_node.
+
 2001-01-27  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* Makefile.in: Remove all dependencies on defaults.h.
diff --git a/gcc/ch/ch-tree.h b/gcc/ch/ch-tree.h
index 5547107..4d652b1 100644
--- a/gcc/ch/ch-tree.h
+++ b/gcc/ch/ch-tree.h
@@ -906,7 +906,6 @@ extern void write_spec_module                   PARAMS ((tree, tree));
 
 /* in ch/lang.c */
 extern tree string_index_type_dummy;
-extern tree integer_minus_one_node;
 extern int  flag_old_strings;
 extern void GNU_xref_begin                      PARAMS ((void));
 extern void GNU_xref_end                        PARAMS ((void));
diff --git a/gcc/ch/decl.c b/gcc/ch/decl.c
index 18a4cc6..11a05e0 100644
--- a/gcc/ch/decl.c
+++ b/gcc/ch/decl.c
@@ -299,9 +299,6 @@ tree default_function_type;
 
 const char **boolean_code_name;
 
-/* A node for the integer constant -1.  */
-tree integer_minus_one_node;
-
 /* Nodes for boolean constants TRUE and FALSE. */
 tree boolean_true_node, boolean_false_node;
 
@@ -3388,9 +3385,6 @@ init_decl_processing ()
   pushdecl (build_decl (TYPE_DECL, ridpointers[(int) RID_DOUBLE],
 			double_type_node));
 
-  integer_minus_one_node = build_int_2 (-1, -1);
-  TREE_TYPE (integer_minus_one_node) = integer_type_node;
-
   build_common_tree_nodes_2 (flag_short_double);
 
   pushdecl (build_decl (TYPE_DECL,
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3fd306d..62da987 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,14 @@
+2001-01-28  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* cp-tree.h (cp_tree_index): Delete CPTI_MINUS_ONE.
+	(minus_one_node): Moved to top level gcc directory.  Renamed
+	to integer_minus_one_node.
+
+	* init.c (init_init_processing): Don't set minus_one_node.
+	(build_vec_init): Use integer_minus_one_node.
+
+	* rtti.c (get_tinfo_decl_dynamic): Likewise.
+
 2001-01-28  Jakub Jelinek  <jakub@redhat.com>
 
 	* optimize.c (copy_body_r): If MODIFY_EXPR has both arguments
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 8122d56..b5e6b99 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -635,7 +635,6 @@ enum cp_tree_index
     CPTI_EMPTY_EXCEPT_SPEC,
     CPTI_NULL,
     CPTI_JCLASS,
-    CPTI_MINUS_ONE,
     CPTI_TERMINATE,
     CPTI_ATEXIT,
     CPTI_DSO_HANDLE,
@@ -768,9 +767,6 @@ extern tree cp_global_trees[CPTI_MAX];
 /* If non-NULL, a POINTER_TYPE equivalent to (java::lang::Class*). */
 #define jclass_node                     cp_global_trees[CPTI_JCLASS]
 
-/* A node for `(int) -1'.  */
-#define minus_one_node                  cp_global_trees[CPTI_MINUS_ONE]
-
 /* The declaration for `std::terminate'.  */
 #define terminate_node                  cp_global_trees[CPTI_TERMINATE]
 
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 3105ff7..1917389 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -65,8 +65,6 @@ void init_init_processing ()
 {
   tree fields[1];
 
-  minus_one_node = build_int_2 (-1, -1);
-
   /* Define the structure that holds header information for
      arrays allocated via operator new.  */
   BI_header_type = make_aggr_type (RECORD_TYPE);
@@ -2989,7 +2987,7 @@ build_vec_init (base, init, from_array)
 
       if_stmt = begin_if_stmt ();
       finish_if_stmt_cond (build (NE_EXPR, boolean_type_node,
-				  iterator, minus_one_node),
+				  iterator, integer_minus_one_node),
 			   if_stmt);
 
       /* Otherwise, loop through the elements.  */
@@ -3063,7 +3061,7 @@ build_vec_init (base, init, from_array)
       finish_do_body (do_stmt);
       finish_do_stmt (build (NE_EXPR, boolean_type_node,
 			     build_unary_op (PREDECREMENT_EXPR, iterator, 0),
-			     minus_one_node),
+			     integer_minus_one_node),
 		      do_stmt);
 
       finish_then_clause (if_stmt);
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index ff39452..f105649 100644
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -265,7 +265,7 @@ get_tinfo_decl_dynamic (exp)
       /* The RTTI information is always in the vtable, but it's at
 	 different indices depending on the ABI.  */
       if (new_abi_rtti_p ())
-	index = minus_one_node;
+	index = integer_minus_one_node;
       else if (flag_vtable_thunks)
 	index = integer_one_node;
       else
diff --git a/gcc/stmt.c b/gcc/stmt.c
index c4e9ce0..8465df7 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -5764,7 +5764,7 @@ static int
 estimate_case_costs (node)
      case_node_ptr node;
 {
-  tree min_ascii = build_int_2 (-1, -1);
+  tree min_ascii = integer_minus_one_node;
   tree max_ascii = convert (TREE_TYPE (node->high), build_int_2 (127, 0));
   case_node_ptr n;
   int i;
diff --git a/gcc/tree.c b/gcc/tree.c
index d183122..9f7fae7 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -4786,6 +4786,7 @@ build_common_tree_nodes_2 (short_double)
   /* Define these next since types below may used them.  */
   integer_zero_node = build_int_2 (0, 0);
   integer_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/tree.h b/gcc/tree.h
index 60f787e..b5acb34 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -1715,6 +1715,7 @@ enum tree_index
     
   TI_INTEGER_ZERO,
   TI_INTEGER_ONE,
+  TI_INTEGER_MINUS_ONE,
   TI_NULL_POINTER,
 
   TI_SIZE_ZERO,
@@ -1770,6 +1771,7 @@ extern tree global_trees[TI_MAX];
 
 #define integer_zero_node		global_trees[TI_INTEGER_ZERO]
 #define integer_one_node		global_trees[TI_INTEGER_ONE]
+#define integer_minus_one_node		global_trees[TI_INTEGER_MINUS_ONE]
 #define size_zero_node			global_trees[TI_SIZE_ZERO]
 #define size_one_node			global_trees[TI_SIZE_ONE]
 #define bitsize_zero_node		global_trees[TI_BITSIZE_ZERO]