Message ID | alpine.LNX.2.00.1303051257070.3543@zhemvz.fhfr.qr |
---|---|
State | New |
Headers | show |
On Tue, Mar 05, 2013 at 12:57:41PM +0100, Richard Biener wrote: > As follows. > > Richard. > > 2013-03-05 Richard Biener <rguenther@suse.de> > > * tree-ssa-sccvn.c (set_value_id_for_result): For a NULL > result set a new value-id. Looks much better. You forgot to adjust the ChangeLog entry, and PR line is missing, if it passes bootstrap, please check it in. > --- gcc/tree-ssa-sccvn.c (revision 196451) > +++ gcc/tree-ssa-sccvn.c (working copy) > @@ -3954,18 +3962,17 @@ free_scc_vn (void) > XDELETE (optimistic_info); > } > > -/* Set *ID if we computed something useful in RESULT. */ > +/* Set *ID according to RESULT. */ > > static void > set_value_id_for_result (tree result, unsigned int *id) > { > - if (result) > - { > - if (TREE_CODE (result) == SSA_NAME) > - *id = VN_INFO (result)->value_id; > - else if (is_gimple_min_invariant (result)) > - *id = get_or_alloc_constant_value_id (result); > - } > + if (result && TREE_CODE (result) == SSA_NAME) > + *id = VN_INFO (result)->value_id; > + else if (result && is_gimple_min_invariant (result)) > + *id = get_or_alloc_constant_value_id (result); > + else > + *id = get_next_value_id (); > } > > /* Set the value ids in the valid hash tables. */ Jakub
Index: gcc/tree-ssa-sccvn.c =================================================================== --- gcc/tree-ssa-sccvn.c (revision 196451) +++ gcc/tree-ssa-sccvn.c (working copy) @@ -3954,18 +3962,17 @@ free_scc_vn (void) XDELETE (optimistic_info); } -/* Set *ID if we computed something useful in RESULT. */ +/* Set *ID according to RESULT. */ static void set_value_id_for_result (tree result, unsigned int *id) { - if (result) - { - if (TREE_CODE (result) == SSA_NAME) - *id = VN_INFO (result)->value_id; - else if (is_gimple_min_invariant (result)) - *id = get_or_alloc_constant_value_id (result); - } + if (result && TREE_CODE (result) == SSA_NAME) + *id = VN_INFO (result)->value_id; + else if (result && is_gimple_min_invariant (result)) + *id = get_or_alloc_constant_value_id (result); + else + *id = get_next_value_id (); } /* Set the value ids in the valid hash tables. */