conflict.c (conflict_graph_add): Pass enum type to htab_find_slot.

	* gcc/conflict.c (conflict_graph_add): Pass enum type to
	htab_find_slot.
	* gcc/cpperror.c (hashtab.h): Now include.
	* gcc/cppexp.c (hashtab.h): Likewise.
	* gcc/cpplex.c (hashtab.h): Likewise.
	* gcc/cppfiles.c (hashtab.h): Likewise.
	(find_include_file, _cpp_calc_hash, cpp_read_file): Pass enum type
	to htab_find_slot_with_hash.
	* gcc/cpphash.c (hashtab.h): Now include.
	(_cpp_lookup_slot): INSERT is now enum insert_option.
	* gcc/cpphash.h (_cpp_lookup_slot): Likewise.
	* gcc/cppinit.c (hashtab.h): Include earlier.
	(initialize_builtins): Pass enum to htab_find_slot.
	* gcc/cpplib.c (hashtab.h): Now include.
	(do_define, do_undef): Pass enum type to _cpp_lookup_slot.
	(do_pragma_poison, do_assert): Likewise.
	* gcc/emit-rtl.c (gen_rtx_CONST_INT): Pass enum to
	htab_find_slot_with_hash.
	* gcc/simplify-rtx.c (cselib_lookup_mem, cselib_lookup): Likewise.
	* gcc/tree.c (type_hash_add): Likewise.
	(build1): Minor cleanup.
	* include/hashtab.h (enum insert_option): New type.
	(htab_find_slot, htab_find_slot_with_hash): Use it.
	* libiberty/hashtab.c: Various minor cleanups.
	(htab_find_slot_with_hash): INSERT is now enum insert_option.
	(htab_find_slot): Likewise.

From-SVN: r33260

diff --git a/gcc/conflict.c b/gcc/conflict.c
index 7ba50cc3c4147f3985ab4d6ec41b0bb4c1dd6af2..3113aa7d8ad3efcf0b77b29ba148b091c31d21cd 100644 (file)
--- a/gcc/conflict.c
+++ b/gcc/conflict.c
@@ -206,7 +206,7 @@ conflict_graph_add (graph, reg1, reg2)
 
   dummy.smaller = smaller;
   dummy.larger = larger;
-  slot = htab_find_slot (graph->arc_hash_table, (void *) &dummy, 1);
+  slot = htab_find_slot (graph->arc_hash_table, (void *) &dummy, INSERT);
   
   /* If the conflict is already there, do nothing.  */
   if (*slot != NULL)

diff --git a/gcc/tree.c b/gcc/tree.c
index 72d670cf3ac1a6d57659e20d0b0a32a392c2b2b8..7a04d49953a95436c0a2cfe2b1cc1e91b3738f9c 100644 (file)
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -3400,11 +3400,8 @@ build1 (code, type, node)
   TREE_SET_PERMANENT (t);
 
   TREE_OPERAND (t, 0) = node;
-  if (node && first_rtl_op (code) != 0)
-    {
-      if (TREE_SIDE_EFFECTS (node))
-       TREE_SIDE_EFFECTS (t) = 1;
-    }
+  if (node && first_rtl_op (code) != 0 && TREE_SIDE_EFFECTS (node))
+    TREE_SIDE_EFFECTS (t) = 1;
 
   switch (code)
     {
@@ -4082,8 +4079,8 @@ type_hash_add (hashcode, type)
   h = (struct type_hash *) permalloc (sizeof (struct type_hash));
   h->hash = hashcode;
   h->type = type;
-  loc = htab_find_slot_with_hash (type_hash_table, h, hashcode, 1);
-  *(struct type_hash**)loc = h;
+  loc = htab_find_slot_with_hash (type_hash_table, h, hashcode, INSERT);
+  *(struct type_hash**) loc = h;
 }
 
 /* Given TYPE, and HASHCODE its hash code, return the canonical