2014-02-12 Thomas Schwinge <thomas@codesourcery.com>
+ * 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.
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. */
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
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)
{
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);