* common.opt (ftree-combine-temps): Remove.

	* tree-outof-ssa.c (SSANORM_COMBINE_TEMPS): Remove.
	(coalesce_ssa_name): Don't check for combine-temps.
	(coalesce_vars): Remove.
	(check_replaceable): Use num_imm_uses.
	(remove_ssa_form, insert_backedge_copies, rewrite_out_of_ssa): Don't 
	check for combine-temps.
	(rewrite_out_of_ssa): Never create a ref_count in the var_map.
	* tree-ssa-copyrename.c (copy_rename_partition_coalesce): Change parms
	to register_ssa_partition calls.
	* tree-ssa-live.c (register_ssa_partition): Remove prototype.
	(init_var_map, delete_var_map): remove refernces to ref_count.
	(create_ssa_var_map): Never calculate a ref count.
	(type_var_init): Remove.
	* tree-ssa-live.h (typedef struct _var_map): Remove ref_count.
	(SSA_VAR_MAP_REF_COUNT): Delete.
	(create_ssa_var_map): Change Prototype to have no parameters.
	(version_ref_count): Delete.
	(register_ssa_partition): Remove 'is_use' paramater and don't set the
	ref_count vector.
	(type_var_num, type_var, type_var_first_partition,
	type_var_next_partition, type_var_dump, type_var_delete,
	type_var_remove_partition, type_var_find, type_var_compact,
	type_var_decompact): Remove.

	* gcc.dg/max-1.c: Remove reference to -fno-tree-lrs option.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@119409 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 3 insertions, 136 deletions

diff --git a/gcc/tree-ssa-live.h b/gcc/tree-ssa-live.h
index 17ada27bda7..625e833770c 100644
--- a/gcc/tree-ssa-live.h
+++ b/gcc/tree-ssa-live.h
@@ -44,9 +44,6 @@ typedef struct _var_map
 
   /* Original partition size.  */
   unsigned int partition_size;
-
-  /* Reference count, if required.  */
-  int *ref_count;
 } *var_map;
 
 #define VAR_ANN_PARTITION(ann) (ann->partition)
@@ -74,11 +71,9 @@ static inline tree var_to_partition_to_var (var_map, tree);
 static inline tree partition_to_var (var_map, int);
 static inline int var_to_partition (var_map, tree);
 static inline tree version_to_var (var_map, int);
-static inline int version_ref_count (var_map, tree);
-static inline void register_ssa_partition (var_map, tree, bool);
+static inline void register_ssa_partition (var_map, tree);
 
-#define SSA_VAR_MAP_REF_COUNT	 0x01
-extern var_map create_ssa_var_map (int);
+extern var_map create_ssa_var_map (void);
 
 /* Number of partitions in MAP.  */
 
@@ -89,17 +84,6 @@ num_var_partitions (var_map map)
 }
 
 
-/* Return the reference count for SSA_VAR's partition in MAP.  */
-
-static inline int
-version_ref_count (var_map map, tree ssa_var)
-{
-  int version = SSA_NAME_VERSION (ssa_var);
-  gcc_assert (map->ref_count);
-  return map->ref_count[version];
-}
- 
-
 /* Given partition index I from MAP, return the variable which represents that 
    partition.  */
  
@@ -176,7 +160,7 @@ var_to_partition_to_var (var_map map, tree var)
    later.  */ 
 
 static inline void
-register_ssa_partition (var_map map, tree ssa_var, bool is_use)
+register_ssa_partition (var_map map, tree ssa_var)
 {
   int version;
 
@@ -185,9 +169,6 @@ register_ssa_partition (var_map map, tree ssa_var, bool is_use)
 #endif
 
   version = SSA_NAME_VERSION (ssa_var);
-  if (is_use && map->ref_count)
-    map->ref_count[version]++;
-
   if (map->partition_to_var[version] == NULL_TREE)
     map->partition_to_var[SSA_NAME_VERSION (ssa_var)] = ssa_var;
 }
@@ -551,120 +532,6 @@ root_var_decompact (root_var_p rv)
 }
 
 
-/* A TYPE_VAR object is similar to a root_var object, except this associates 
-   partitions with their type rather than their root variable.  This is used to 
-   coalesce memory locations based on type.  */
-
-typedef tpa_p type_var_p;
-
-static inline tree type_var (type_var_p, int);
-static inline int type_var_first_partition (type_var_p, int);
-static inline int type_var_next_partition (type_var_p, int);
-static inline int type_var_num (type_var_p);
-static inline void type_var_dump (FILE *, type_var_p);
-static inline void type_var_remove_partition (type_var_p, int, int);
-static inline void type_var_delete (type_var_p);
-static inline int type_var_find (type_var_p, int);
-static inline int type_var_compact (type_var_p);
-static inline void type_var_decompact (type_var_p);
-
-extern type_var_p type_var_init (var_map);
-
-/* Value returned when there is no partitions associated with a list.  */
-#define TYPE_VAR_NONE		TPA_NONE
-
-
-/* Return the number of distinct type lists in TV.  */
-
-static inline int 
-type_var_num (type_var_p tv)
-{
-  return tpa_num_trees (tv);
-}
-
-
-/* Return the type of list I in TV.  */
-
-static inline tree
-type_var (type_var_p tv, int i)
-{
-  return tpa_tree (tv, i);
-}
-
-
-/* Return the first partition belonging to type list I in TV.  */
-
-static inline int
-type_var_first_partition (type_var_p tv, int i)
-{
-  return tpa_first_partition (tv, i);
-}
-
-
-/* Return the next partition after partition I in a type list within TV.  */
-
-static inline int
-type_var_next_partition (type_var_p tv, int i)
-{
-  return tpa_next_partition (tv, i);
-}
-
-
-/* Send debug info for type_var object TV to file F.  */
-
-static inline void
-type_var_dump (FILE *f, type_var_p tv)
-{
-  fprintf (f, "\nType Var dump\n");
-  tpa_dump (f, tv);
-  fprintf (f, "\n");
-}
-
-
-/* Delete type_var object TV.  */
-
-static inline void
-type_var_delete (type_var_p tv)
-{
-  tpa_delete (tv);
-}
-
-
-/* Remove partition PARTITION_INDEX from type list TYPE_INDEX in TV.  */
-
-static inline void
-type_var_remove_partition (type_var_p tv, int type_index, int partition_index)
-{
-  tpa_remove_partition (tv, type_index, partition_index);
-}
-
-
-/* Return the type index in TV for the list partition I is in.  */
-
-static inline int
-type_var_find (type_var_p tv, int i)
-{
-  return tpa_find_tree (tv, i);
-}
-
-
-/* Hide single element lists in TV.  */
-
-static inline int 
-type_var_compact (type_var_p tv)
-{
-  return tpa_compact (tv);
-}
-
-
-/* Expose single element lists in TV.  */
-
-static inline void
-type_var_decompact (type_var_p tv)
-{
-  tpa_decompact (tv);
-}
-
 /* This set of routines implements a coalesce_list. This is an object which
    is used to track pairs of partitions which are desirable to coalesce
    together at some point.  Costs are associated with each pair, and when