diff options
Diffstat (limited to 'gcc/tree-dfa.c')
-rw-r--r-- | gcc/tree-dfa.c | 41 |
1 files changed, 26 insertions, 15 deletions
diff --git a/gcc/tree-dfa.c b/gcc/tree-dfa.c index f66a50c..346f6f3 100644 --- a/gcc/tree-dfa.c +++ b/gcc/tree-dfa.c @@ -641,16 +641,12 @@ find_vars_r (tree *tp, int *walk_subtrees, void *data ATTRIBUTE_UNUSED) tree referenced_var_lookup (unsigned int uid) { - tree var; - - gcc_assert (bitmap_bit_p (gimple_referenced_vars (cfun), uid)); - - /* For now also assert that the variable is really referenced. - Otherwise callers need to deal with the result from this function - being NULL. */ - var = lookup_decl_from_uid (uid); - gcc_assert (var); - return var; + tree h; + struct tree_decl_minimal in; + in.uid = uid; + h = (tree) htab_find_with_hash (gimple_referenced_vars (cfun), &in, uid); + gcc_assert (h || uid == 0); + return h; } /* Check if TO is in the referenced_vars hash table and insert it if not. @@ -659,13 +655,23 @@ referenced_var_lookup (unsigned int uid) bool referenced_var_check_and_insert (tree to) { + tree h, *loc; + struct tree_decl_minimal in; unsigned int uid = DECL_UID (to); - if (bitmap_bit_p (gimple_referenced_vars (cfun), uid)) - return false; - - bitmap_set_bit (gimple_referenced_vars (cfun), uid); + in.uid = uid; + h = (tree) htab_find_with_hash (gimple_referenced_vars (cfun), &in, uid); + if (h) + { + /* DECL_UID has already been entered in the table. Verify that it is + the same entry as TO. See PR 27793. */ + gcc_assert (h == to); + return false; + } + loc = (tree *) htab_find_slot_with_hash (gimple_referenced_vars (cfun), + &in, uid, INSERT); + *loc = to; return true; } @@ -755,6 +761,8 @@ void remove_referenced_var (tree var) { var_ann_t v_ann; + struct tree_decl_minimal in; + void **loc; unsigned int uid = DECL_UID (var); subvar_t sv; @@ -774,7 +782,10 @@ remove_referenced_var (tree var) ggc_free (v_ann); var->base.ann = NULL; gcc_assert (DECL_P (var)); - bitmap_clear_bit (gimple_referenced_vars (cfun), uid); + in.uid = uid; + loc = htab_find_slot_with_hash (gimple_referenced_vars (cfun), &in, uid, + NO_INSERT); + htab_clear_slot (gimple_referenced_vars (cfun), loc); } |