diff options
Diffstat (limited to 'gcc/tree-sra.c')
-rw-r--r-- | gcc/tree-sra.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c index 0afa197..3dac50f 100644 --- a/gcc/tree-sra.c +++ b/gcc/tree-sra.c @@ -320,7 +320,7 @@ uid_decl_hasher::equal (const value_type *a, const compare_type *b) /* Set of candidates. */ static bitmap candidate_bitmap; -static hash_table <uid_decl_hasher> candidates; +static hash_table<uid_decl_hasher> *candidates; /* For a candidate UID return the candidates decl. */ @@ -329,7 +329,7 @@ candidate (unsigned uid) { tree_node t; t.decl_minimal.uid = uid; - return candidates.find_with_hash (&t, static_cast <hashval_t> (uid)); + return candidates->find_with_hash (&t, static_cast <hashval_t> (uid)); } /* Bitmap of candidates which we should try to entirely scalarize away and @@ -660,7 +660,8 @@ static void sra_initialize (void) { candidate_bitmap = BITMAP_ALLOC (NULL); - candidates.create (vec_safe_length (cfun->local_decls) / 2); + candidates = new hash_table<uid_decl_hasher> + (vec_safe_length (cfun->local_decls) / 2); should_scalarize_away_bitmap = BITMAP_ALLOC (NULL); cannot_scalarize_away_bitmap = BITMAP_ALLOC (NULL); gcc_obstack_init (&name_obstack); @@ -690,7 +691,8 @@ static void sra_deinitialize (void) { BITMAP_FREE (candidate_bitmap); - candidates.dispose (); + delete candidates; + candidates = NULL; BITMAP_FREE (should_scalarize_away_bitmap); BITMAP_FREE (cannot_scalarize_away_bitmap); free_alloc_pool (access_pool); @@ -707,9 +709,7 @@ static void disqualify_candidate (tree decl, const char *reason) { if (bitmap_clear_bit (candidate_bitmap, DECL_UID (decl))) - candidates.clear_slot (candidates.find_slot_with_hash (decl, - DECL_UID (decl), - NO_INSERT)); + candidates->remove_elt_with_hash (decl, DECL_UID (decl)); if (dump_file && (dump_flags & TDF_DETAILS)) { @@ -1833,7 +1833,7 @@ maybe_add_sra_candidate (tree var) } bitmap_set_bit (candidate_bitmap, DECL_UID (var)); - slot = candidates.find_slot_with_hash (var, DECL_UID (var), INSERT); + slot = candidates->find_slot_with_hash (var, DECL_UID (var), INSERT); *slot = var; if (dump_file && (dump_flags & TDF_DETAILS)) @@ -3792,7 +3792,7 @@ find_param_candidates (void) continue; bitmap_set_bit (candidate_bitmap, DECL_UID (parm)); - slot = candidates.find_slot_with_hash (parm, DECL_UID (parm), INSERT); + slot = candidates->find_slot_with_hash (parm, DECL_UID (parm), INSERT); *slot = parm; ret = true; |