FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tree-inline.c (duplicate_remap_omp_clause_seq): New function.

Browse source 
2015-12-10  Martin Jambor  <mjambor@suse.cz>

	* tree-inline.c (duplicate_remap_omp_clause_seq): New function.
	(replace_locals_op): Duplicate gimple sequences in OMP clauses.

From-SVN: r231523
This commit is contained in:
Martin Jambor 2015-12-10 16:40:57 +01:00 • committed by Martin Jambor
parent 4c1ca083ca
commit f680334141
2 changed files with 51 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/ChangeLog
View file

@ -1,3 +1,8 @@
2015-12-10 Martin Jambor <mjambor@suse.cz>
* tree-inline.c (duplicate_remap_omp_clause_seq): New function.
(replace_locals_op): Duplicate gimple sequences in OMP clauses.
2015-12-10 David Malcolm <dmalcolm@redhat.com>
* graphite-optimize-isl.c (scop_get_domains): Fix indentation.

46
gcc/tree-inline.c
View file

@ -5116,6 +5116,8 @@ mark_local_labels_stmt (gimple_stmt_iterator *gsip,
return NULL_TREE;
}
static gimple_seq duplicate_remap_omp_clause_seq (gimple_seq seq,
struct walk_stmt_info *wi);
/* Called via walk_gimple_seq by copy_gimple_seq_and_replace_local.
Using the splay_tree pointed to by ST (which is really a `splay_tree'),
@ -5160,6 +5162,35 @@ replace_locals_op (tree *tp, int *walk_subtrees, void *data)
TREE_OPERAND (expr, 3) = NULL_TREE;
}
}
else if (TREE_CODE (expr) == OMP_CLAUSE)
{
/* Before the omplower pass completes, some OMP clauses can contain
sequences that are neither copied by gimple_seq_copy nor walked by
walk_gimple_seq. To make copy_gimple_seq_and_replace_locals work even
in those situations, we have to copy and process them explicitely. */
if (OMP_CLAUSE_CODE (expr) == OMP_CLAUSE_LASTPRIVATE)
{
gimple_seq seq = OMP_CLAUSE_LASTPRIVATE_GIMPLE_SEQ (expr);
seq = duplicate_remap_omp_clause_seq (seq, wi);
OMP_CLAUSE_LASTPRIVATE_GIMPLE_SEQ (expr) = seq;
}
else if (OMP_CLAUSE_CODE (expr) == OMP_CLAUSE_LINEAR)
{
gimple_seq seq = OMP_CLAUSE_LINEAR_GIMPLE_SEQ (expr);
seq = duplicate_remap_omp_clause_seq (seq, wi);
OMP_CLAUSE_LINEAR_GIMPLE_SEQ (expr) = seq;
}
else if (OMP_CLAUSE_CODE (expr) == OMP_CLAUSE_REDUCTION)
{
gimple_seq seq = OMP_CLAUSE_REDUCTION_GIMPLE_INIT (expr);
seq = duplicate_remap_omp_clause_seq (seq, wi);
OMP_CLAUSE_REDUCTION_GIMPLE_INIT (expr) = seq;
seq = OMP_CLAUSE_REDUCTION_GIMPLE_MERGE (expr);
seq = duplicate_remap_omp_clause_seq (seq, wi);
OMP_CLAUSE_REDUCTION_GIMPLE_MERGE (expr) = seq;
}
}
/* Keep iterating. */
return NULL_TREE;
@ -5200,6 +5231,21 @@ replace_locals_stmt (gimple_stmt_iterator *gsip,
return NULL_TREE;
}
/* Create a copy of SEQ and remap all decls in it. */
static gimple_seq
duplicate_remap_omp_clause_seq (gimple_seq seq, struct walk_stmt_info *wi)
{
if (!seq)
return NULL;
/* If there are any labels in OMP sequences, they can be only referred to in
the sequence itself and therefore we can do both here. */
walk_gimple_seq (seq, mark_local_labels_stmt, NULL, wi);
gimple_seq copy = gimple_seq_copy (seq);
walk_gimple_seq (copy, replace_locals_stmt, replace_locals_op, wi);
return copy;
}
/* Copies everything in SEQ and replaces variables and labels local to
current_function_decl. */