| Message ID | 20111219140202.GE1957@tyan-ft48-01.lab.bos.redhat.com |
|---|---|
| State | New |
| Headers | show |
On Mon, 19 Dec 2011, Jakub Jelinek wrote: > Hi! > > This patch renames gimplify_seq_add_stmt to > gimple_seq_add_stmt_without_update so that it is more clear what > it does, keeping the old name because it is shorter inside > of gimplify.c to avoid having to reformat it. > > Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? Ok. Thanks, Richard. > 2011-12-19 Jakub Jelinek <jakub@redhat.com> > > * gimple.h (gimplify_seq_add_stmt): Rename to... > (gimple_seq_add_stmt_without_update): ... this. > * gimplify.c (gimplify_seq_add_stmt): Rename to... > (gimple_seq_add_stmt_without_update): ... this. > (gimplify_seq_add_stmt): New inline wrapper for it. > * tree-vect-patterns.c (append_pattern_def_seq): Use > gimple_seq_add_stmt_without_update instead of gimplify_seq_add_stmt. > > * cp-gimplify.c (gimplify_must_not_throw_expr): Use > gimple_seq_add_stmt_without_update instead of gimplify_seq_add_stmt. > > --- gcc/gimple.h.jj 2011-12-08 16:36:52.000000000 +0100 > +++ gcc/gimple.h 2011-12-19 10:04:07.426818408 +0100 > @@ -226,7 +226,7 @@ void gimple_seq_add_stmt (gimple_seq *, > similar to gimple_seq_add_stmt, but does not scan the operands. > During gimplification, we need to manipulate statement sequences > before the def/use vectors have been constructed. */ > -void gimplify_seq_add_stmt (gimple_seq *, gimple); > +void gimple_seq_add_stmt_without_update (gimple_seq *, gimple); > > /* Allocate a new sequence and initialize its first element with STMT. */ > > --- gcc/gimplify.c.jj 2011-12-12 22:10:26.000000000 +0100 > +++ gcc/gimplify.c 2011-12-19 10:17:23.724253630 +0100 > @@ -162,7 +162,7 @@ gimple_tree_eq (const void *p1, const vo > before the def/use vectors have been constructed. */ > > void > -gimplify_seq_add_stmt (gimple_seq *seq_p, gimple gs) > +gimple_seq_add_stmt_without_update (gimple_seq *seq_p, gimple gs) > { > gimple_stmt_iterator si; > > @@ -177,6 +177,15 @@ gimplify_seq_add_stmt (gimple_seq *seq_p > gsi_insert_after_without_update (&si, gs, GSI_NEW_STMT); > } > > +/* Shorter alias name for the above function for use in gimplify.c > + only. */ > + > +static inline void > +gimplify_seq_add_stmt (gimple_seq *seq_p, gimple gs) > +{ > + gimple_seq_add_stmt_without_update (seq_p, gs); > +} > + > /* Append sequence SRC to the end of sequence *DST_P. If *DST_P is > NULL, a new sequence is allocated. This function is > similar to gimple_seq_add_seq, but does not scan the operands. > --- gcc/tree-vect-patterns.c.jj 2011-12-19 10:19:18.060596060 +0100 > +++ gcc/tree-vect-patterns.c 2011-12-19 10:18:34.443847675 +0100 > @@ -73,7 +73,8 @@ static vect_recog_func_ptr vect_vect_rec > static inline void > append_pattern_def_seq (stmt_vec_info stmt_info, gimple stmt) > { > - gimplify_seq_add_stmt (&STMT_VINFO_PATTERN_DEF_SEQ (stmt_info), stmt); > + gimple_seq_add_stmt_without_update (&STMT_VINFO_PATTERN_DEF_SEQ (stmt_info), > + stmt); > } > > static inline void > --- gcc/cp/cp-gimplify.c.jj 2011-11-21 16:21:59.000000000 +0100 > +++ gcc/cp/cp-gimplify.c 2011-12-19 09:56:04.101606676 +0100 > @@ -475,10 +475,10 @@ gimplify_must_not_throw_expr (tree *expr > > gimplify_and_add (body, &try_); > mnt = gimple_build_eh_must_not_throw (terminate_node); > - gimplify_seq_add_stmt (&catch_, mnt); > + gimple_seq_add_stmt_without_update (&catch_, mnt); > mnt = gimple_build_try (try_, catch_, GIMPLE_TRY_CATCH); > > - gimplify_seq_add_stmt (pre_p, mnt); > + gimple_seq_add_stmt_without_update (pre_p, mnt); > if (temp) > { > *expr_p = temp; > > Jakub > >
--- gcc/gimple.h.jj 2011-12-08 16:36:52.000000000 +0100 +++ gcc/gimple.h 2011-12-19 10:04:07.426818408 +0100 @@ -226,7 +226,7 @@ void gimple_seq_add_stmt (gimple_seq *, similar to gimple_seq_add_stmt, but does not scan the operands. During gimplification, we need to manipulate statement sequences before the def/use vectors have been constructed. */ -void gimplify_seq_add_stmt (gimple_seq *, gimple); +void gimple_seq_add_stmt_without_update (gimple_seq *, gimple); /* Allocate a new sequence and initialize its first element with STMT. */ --- gcc/gimplify.c.jj 2011-12-12 22:10:26.000000000 +0100 +++ gcc/gimplify.c 2011-12-19 10:17:23.724253630 +0100 @@ -162,7 +162,7 @@ gimple_tree_eq (const void *p1, const vo before the def/use vectors have been constructed. */ void -gimplify_seq_add_stmt (gimple_seq *seq_p, gimple gs) +gimple_seq_add_stmt_without_update (gimple_seq *seq_p, gimple gs) { gimple_stmt_iterator si; @@ -177,6 +177,15 @@ gimplify_seq_add_stmt (gimple_seq *seq_p gsi_insert_after_without_update (&si, gs, GSI_NEW_STMT); } +/* Shorter alias name for the above function for use in gimplify.c + only. */ + +static inline void +gimplify_seq_add_stmt (gimple_seq *seq_p, gimple gs) +{ + gimple_seq_add_stmt_without_update (seq_p, gs); +} + /* Append sequence SRC to the end of sequence *DST_P. If *DST_P is NULL, a new sequence is allocated. This function is similar to gimple_seq_add_seq, but does not scan the operands. --- gcc/tree-vect-patterns.c.jj 2011-12-19 10:19:18.060596060 +0100 +++ gcc/tree-vect-patterns.c 2011-12-19 10:18:34.443847675 +0100 @@ -73,7 +73,8 @@ static vect_recog_func_ptr vect_vect_rec static inline void append_pattern_def_seq (stmt_vec_info stmt_info, gimple stmt) { - gimplify_seq_add_stmt (&STMT_VINFO_PATTERN_DEF_SEQ (stmt_info), stmt); + gimple_seq_add_stmt_without_update (&STMT_VINFO_PATTERN_DEF_SEQ (stmt_info), + stmt); } static inline void --- gcc/cp/cp-gimplify.c.jj 2011-11-21 16:21:59.000000000 +0100 +++ gcc/cp/cp-gimplify.c 2011-12-19 09:56:04.101606676 +0100 @@ -475,10 +475,10 @@ gimplify_must_not_throw_expr (tree *expr gimplify_and_add (body, &try_); mnt = gimple_build_eh_must_not_throw (terminate_node); - gimplify_seq_add_stmt (&catch_, mnt); + gimple_seq_add_stmt_without_update (&catch_, mnt); mnt = gimple_build_try (try_, catch_, GIMPLE_TRY_CATCH); - gimplify_seq_add_stmt (pre_p, mnt); + gimple_seq_add_stmt_without_update (pre_p, mnt); if (temp) { *expr_p = temp;