diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 57f9e4e2b08..974af002d5e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,13 @@ 2011-12-19 Jakub Jelinek + * 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. + PR tree-optimization/51596 * tree-cfg.c (replace_uses_by): Call gimple_purge_dead_eh_edges when needed. diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 640bf9a9092..d8b30df5547 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2011-12-19 Jakub Jelinek + + * cp-gimplify.c (gimplify_must_not_throw_expr): Use + gimple_seq_add_stmt_without_update instead of gimplify_seq_add_stmt. + 2011-12-19 Dodji Seketeli PR c++/51477 diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index 9968c3dd7ee..c68069db2f3 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -475,10 +475,10 @@ gimplify_must_not_throw_expr (tree *expr_p, gimple_seq *pre_p) 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; diff --git a/gcc/gimple.h b/gcc/gimple.h index 487b516cbd3..9ac8f26c55f 100644 --- a/gcc/gimple.h +++ b/gcc/gimple.h @@ -226,7 +226,7 @@ void gimple_seq_add_stmt (gimple_seq *, gimple); 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. */ diff --git a/gcc/gimplify.c b/gcc/gimplify.c index fe8d2f801a3..14d627e7254 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -162,7 +162,7 @@ gimple_tree_eq (const void *p1, const void *p2) 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, gimple gs) 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. diff --git a/gcc/tree-vect-patterns.c b/gcc/tree-vect-patterns.c index 3425cdc5f72..a5b8af911aa 100644 --- a/gcc/tree-vect-patterns.c +++ b/gcc/tree-vect-patterns.c @@ -73,7 +73,8 @@ static vect_recog_func_ptr vect_vect_recog_func_ptrs[NUM_PATTERNS] = { 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