Hi, This patch reverts the omp_data_i init handling in ccp and forwprop.
Committed to gomp-4_0-branch. Thanks, - Tom
Revert omp_data_i init handling in ccp and forwprop 2015-11-05 Tom de Vries <t...@codesourcery.com> Revert: 2015-04-21 Tom de Vries <t...@codesourcery.com> * tree-ssa-ccp.c: Include omp-low.h. (surely_varying_stmt_p, ccp_visit_stmt): Handle .omp_data_i init conservatively. * tree-ssa-forwprop.c: Include omp-low.h. (pass_forwprop::execute): Handle .omp_data_i init conservatively. --- gcc/tree-ssa-ccp.c | 6 ------ gcc/tree-ssa-forwprop.c | 4 +--- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c index cf93277..2831cfe 100644 --- a/gcc/tree-ssa-ccp.c +++ b/gcc/tree-ssa-ccp.c @@ -147,7 +147,6 @@ along with GCC; see the file COPYING3. If not see #include "params.h" #include "builtins.h" #include "tree-chkp.h" -#include "omp-low.h" /* Possible lattice values. */ @@ -810,9 +809,6 @@ surely_varying_stmt_p (gimple *stmt) && gimple_code (stmt) != GIMPLE_CALL) return true; - if (gimple_stmt_omp_data_i_init_p (stmt)) - return true; - return false; } @@ -2368,8 +2364,6 @@ ccp_visit_stmt (gimple *stmt, edge *taken_edge_p, tree *output_p) switch (gimple_code (stmt)) { case GIMPLE_ASSIGN: - if (gimple_stmt_omp_data_i_init_p (stmt)) - break; /* If the statement is an assignment that produces a single output value, evaluate its RHS to see if the lattice value of its output has changed. */ diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c index bb08a4a..491178d 100644 --- a/gcc/tree-ssa-forwprop.c +++ b/gcc/tree-ssa-forwprop.c @@ -60,7 +60,6 @@ along with GCC; see the file COPYING3. If not see #include "tree-cfgcleanup.h" #include "tree-into-ssa.h" #include "cfganal.h" -#include "omp-low.h" /* This pass propagates the RHS of assignment statements into use sites of the LHS of the assignment. It's basically a specialized @@ -2132,8 +2131,7 @@ pass_forwprop::execute (function *fun) tree lhs, rhs; enum tree_code code; - if (!is_gimple_assign (stmt) - || gimple_stmt_omp_data_i_init_p (stmt)) + if (!is_gimple_assign (stmt)) { gsi_next (&gsi); continue; -- 1.9.1