diff options
-rw-r--r-- | gcc/conflict.c | 2 | ||||
-rw-r--r-- | gcc/tree.c | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/gcc/conflict.c b/gcc/conflict.c index 7ba50cc..3113aa7 100644 --- 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) @@ -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 |