From c09f306de67fe3aa2edb1193d558dd2d9471fc7f Mon Sep 17 00:00:00 2001 From: tschwinge Date: Wed, 12 Feb 2014 14:46:30 +0000 Subject: [PATCH] Refactor common code into new maybe_fold_stmt function. gcc/ * gimplify.c (gimplify_call_expr, gimplify_modify_expr): Move common code... (maybe_fold_stmt): ... into this new function. * omp-low.c (lower_omp): Update comment. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@207724 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/gimplify.c | 32 ++++++++++++++++---------------- gcc/omp-low.c | 5 ++--- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 25f1bf466fb..caf93a919da 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2014-02-12 Thomas Schwinge + * gimplify.c (gimplify_call_expr, gimplify_modify_expr): Move + common code... + (maybe_fold_stmt): ... into this new function. + * omp-low.c (lower_omp): Update comment. + * omp-low.c (lower_omp_target): Add clobber for sizes array, after last use. diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 957a82f107a..ff341d43bf3 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -2191,6 +2191,20 @@ gimplify_arg (tree *arg_p, gimple_seq *pre_p, location_t call_location) return gimplify_expr (arg_p, pre_p, NULL, test, fb); } +/* Don't fold STMT inside ORT_TARGET, because it can break code by adding decl + references that weren't in the source. We'll do it during omplower pass + instead. */ + +static bool +maybe_fold_stmt (gimple_stmt_iterator *gsi) +{ + struct gimplify_omp_ctx *ctx; + for (ctx = gimplify_omp_ctxp; ctx; ctx = ctx->outer_context) + if (ctx->region_type == ORT_TARGET) + return false; + return fold_stmt (gsi); +} + /* Gimplify the CALL_EXPR node *EXPR_P into the GIMPLE sequence PRE_P. WANT_VALUE is true if the result of the call is desired. */ @@ -2424,14 +2438,7 @@ gimplify_call_expr (tree *expr_p, gimple_seq *pre_p, bool want_value) notice_special_calls (call); gimplify_seq_add_stmt (pre_p, call); gsi = gsi_last (*pre_p); - /* Don't fold stmts inside of target construct. We'll do it - during omplower pass instead. */ - struct gimplify_omp_ctx *ctx; - for (ctx = gimplify_omp_ctxp; ctx; ctx = ctx->outer_context) - if (ctx->region_type == ORT_TARGET) - break; - if (ctx == NULL) - fold_stmt (&gsi); + maybe_fold_stmt (&gsi); *expr_p = NULL_TREE; } else @@ -4579,14 +4586,7 @@ gimplify_modify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p, gimplify_seq_add_stmt (pre_p, assign); gsi = gsi_last (*pre_p); - /* Don't fold stmts inside of target construct. We'll do it - during omplower pass instead. */ - struct gimplify_omp_ctx *ctx; - for (ctx = gimplify_omp_ctxp; ctx; ctx = ctx->outer_context) - if (ctx->region_type == ORT_TARGET) - break; - if (ctx == NULL) - fold_stmt (&gsi); + maybe_fold_stmt (&gsi); if (want_value) { diff --git a/gcc/omp-low.c b/gcc/omp-low.c index e7fc7309a42..91c8656ee9c 100644 --- a/gcc/omp-low.c +++ b/gcc/omp-low.c @@ -10134,9 +10134,8 @@ lower_omp (gimple_seq *body, omp_context *ctx) gimple_stmt_iterator gsi; for (gsi = gsi_start (*body); !gsi_end_p (gsi); gsi_next (&gsi)) lower_omp_1 (&gsi, ctx); - /* Inside target region we haven't called fold_stmt during gimplification, - because it can break code by adding decl references that weren't in the - source. Call fold_stmt now. */ + /* During gimplification, we have not always invoked fold_stmt + (gimplify.c:maybe_fold_stmt); call it now. */ if (target_nesting_level) for (gsi = gsi_start (*body); !gsi_end_p (gsi); gsi_next (&gsi)) fold_stmt (&gsi); -- 2.11.4.GIT