diff options
| author | Michael Matz <matz@suse.de> | 2012-05-03 14:34:07 +0000 |
|---|---|---|
| committer | Michael Matz <matz@gcc.gnu.org> | 2012-05-03 14:34:07 +0000 |
| commit | 3e8b732e26584184ee273b8bab8fc924681c770b (patch) | |
| tree | d681839cfc46539f6a7285ab0aee7f6206b1d145 /gcc/tree-cfg.c | |
| parent | 1fa2969ff66462973c073f4605d8881e40551aff (diff) | |
| download | gcc-3e8b732e26584184ee273b8bab8fc924681c770b.zip gcc-3e8b732e26584184ee273b8bab8fc924681c770b.tar.gz gcc-3e8b732e26584184ee273b8bab8fc924681c770b.tar.bz2 | |
basic-block.h (struct rtl_bb_info, [...]): Move in front of basic_block_def.
* basic-block.h (struct rtl_bb_info, struct gimple_bb_info): Move
in front of basic_block_def.
(struct basic_block_def): Make il.gimple the full struct, not a
pointer.
(__assert_gimple_bb_smaller_rtl_bb): Asserting typedef.
* cfgexpand.c (expand_gimple_basic_block): Clear all il.gimple
members.
* gimple-iterator.c (gimple_stmt_iterator): Don't special case
NULL il.gimple, which can't happen anymore.
* gimple.h (bb_seq): il.gimple can't be NULL.
(bb_seq_add): Ditto.
(set_bb_seq): Adjust.
(gsi_start_bb, gsi_last_bb): Tidy.
* lto-streamer-in.c (make_new_block): Don't zero members that
are zeroed already, don't allocate a gimple_bb_info.
* tree-cfg.c (create_bb): Don't allocate a gimple_bb_info.
(remove_bb): Clear all il.gimple members.
(gimple_verify_flow_info): Adjust for flat il.gimple.
* tree-flow-inline.h (phi_nodes, phi_nodes_ptr, set_phi_nodes): Adjust.
* coretypes.h (const_gimple_seq): Remove typedef.
* gimple.h (gimple_seq_first): Take gimple_seq.
(gimple_seq_first_stmt): Ditto.
(gimple_seq_last): Ditto.
(gimple_seq_last_stmt): Ditto.
(gimple_seq_empty_p): Ditto.
From-SVN: r187099
Diffstat (limited to 'gcc/tree-cfg.c')
| -rw-r--r-- | gcc/tree-cfg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index 7d884c9..c9f02f3 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -438,7 +438,6 @@ create_bb (void *h, void *e, basic_block after) bb->index = last_basic_block; bb->flags = BB_NEW; - bb->il.gimple = ggc_alloc_cleared_gimple_bb_info (); set_bb_seq (bb, h ? (gimple_seq) h : NULL); /* Add the new block to the linked list of blocks. */ @@ -1918,7 +1917,8 @@ remove_bb (basic_block bb) } remove_phi_nodes_and_edges_for_unreachable_block (bb); - bb->il.gimple = NULL; + bb->il.gimple.seq = NULL; + bb->il.gimple.phi_nodes = NULL; } @@ -4614,13 +4614,13 @@ gimple_verify_flow_info (void) edge e; edge_iterator ei; - if (ENTRY_BLOCK_PTR->il.gimple) + if (ENTRY_BLOCK_PTR->il.gimple.seq || ENTRY_BLOCK_PTR->il.gimple.phi_nodes) { error ("ENTRY_BLOCK has IL associated with it"); err = 1; } - if (EXIT_BLOCK_PTR->il.gimple) + if (EXIT_BLOCK_PTR->il.gimple.seq || EXIT_BLOCK_PTR->il.gimple.phi_nodes) { error ("EXIT_BLOCK has IL associated with it"); err = 1; |