diff options
| author | Trevor Saunders <tsaunders@mozilla.com> | 2013-11-14 05:56:59 -0500 |
|---|---|---|
| committer | Trevor Saunders <tsaunders@mozilla.com> | 2013-11-15 20:10:56 -0500 |
| commit | 994ab8bb4b8a0ba60ddb3a669f510dd56d7ccae4 (patch) | |
| tree | 4ee2d43c1f02a52325af9bde6e5cafac422034a0 /gcc/tree-eh.c | |
| parent | c5e121d5bfabffc4b75c327a374816fc6a01fd6d (diff) | |
| download | gcc-994ab8bb4b8a0ba60ddb3a669f510dd56d7ccae4.tar.gz | |
add ctor / dtor to bitmap_head
Diffstat (limited to 'gcc/tree-eh.c')
| -rw-r--r-- | gcc/tree-eh.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c index a489b61c3f2..6f22082e259 100644 --- a/gcc/tree-eh.c +++ b/gcc/tree-eh.c @@ -4100,7 +4100,6 @@ cleanup_empty_eh_merge_phis (basic_block new_bb, basic_block old_bb, gimple_stmt_iterator ngsi, ogsi; edge_iterator ei; edge e; - bitmap ophi_handled; /* The destination block must not be a regular successor for any of the preds of the landing pad. Thus, avoid turning @@ -4121,7 +4120,7 @@ cleanup_empty_eh_merge_phis (basic_block new_bb, basic_block old_bb, FOR_EACH_EDGE (e, ei, old_bb->preds) redirect_edge_var_map_clear (e); - ophi_handled = BITMAP_ALLOC (NULL); + bitmap_head ophi_handled; /* First, iterate through the PHIs on NEW_BB and set up the edge_var_map for the edges we're going to move. */ @@ -4161,7 +4160,7 @@ cleanup_empty_eh_merge_phis (basic_block new_bb, basic_block old_bb, goto fail; } } - bitmap_set_bit (ophi_handled, SSA_NAME_VERSION (nop)); + bitmap_set_bit (&ophi_handled, SSA_NAME_VERSION (nop)); FOR_EACH_EDGE (e, ei, old_bb->preds) { location_t oloc; @@ -4193,7 +4192,7 @@ cleanup_empty_eh_merge_phis (basic_block new_bb, basic_block old_bb, { gimple ophi = gsi_stmt (ogsi); tree oresult = gimple_phi_result (ophi); - if (!bitmap_bit_p (ophi_handled, SSA_NAME_VERSION (oresult))) + if (!bitmap_bit_p (&ophi_handled, SSA_NAME_VERSION (oresult))) goto fail; } @@ -4223,13 +4222,11 @@ cleanup_empty_eh_merge_phis (basic_block new_bb, basic_block old_bb, else ei_next (&ei); - BITMAP_FREE (ophi_handled); return true; fail: FOR_EACH_EDGE (e, ei, old_bb->preds) redirect_edge_var_map_clear (e); - BITMAP_FREE (ophi_handled); return false; } |