OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR middle-end/52547 (ICE with openmp with nested function which requires a trampoline) 

PR middle-end/52547
	* tree-nested.c (convert_tramp_reference_stmt): Call declare_vars
	on any new_local_var_chain vars declared during recursing on
	GIMPLE_OMP_PARALLEL or GIMPLE_OMP_TASK body.

	* testsuite/libgomp.c/pr52547.c: New test.

From-SVN: r185707
This commit is contained in:
Jakub Jelinek 2012-03-22 20:25:36 +01:00 committed by Jakub Jelinek
parent e75b54a2d9
commit c140ddf392
4 changed files with 70 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2012-03-22 Jakub Jelinek <jakub@redhat.com>
PR middle-end/52547
* tree-nested.c (convert_tramp_reference_stmt): Call declare_vars
on any new_local_var_chain vars declared during recursing on
GIMPLE_OMP_PARALLEL or GIMPLE_OMP_TASK body.
2012-03-22 Uros Bizjak <ubizjak@gmail.com>
* config/alpha/alpha.h (ASM_OUTPUT_ALIGN): Move to config/alpha/elf.h

26
gcc/tree-nested.c
View File

@ -1954,6 +1954,7 @@ static tree
convert_tramp_reference_stmt (gimple_stmt_iterator *gsi, bool *handled_ops_p,
struct walk_stmt_info *wi)
{
struct nesting_info *info = (struct nesting_info *) wi->info;
gimple stmt = gsi_stmt (*gsi);
switch (gimple_code (stmt))
@ -1966,16 +1967,33 @@ convert_tramp_reference_stmt (gimple_stmt_iterator *gsi, bool *handled_ops_p,
for (i = 0; i < nargs; i++)
walk_tree (gimple_call_arg_ptr (stmt, i), convert_tramp_reference_op,
wi, NULL);
*handled_ops_p = true;
return NULL_TREE;
break;
}
case GIMPLE_OMP_PARALLEL:
case GIMPLE_OMP_TASK:
{
tree save_local_var_chain;
walk_gimple_op (stmt, convert_tramp_reference_op, wi);
save_local_var_chain = info->new_local_var_chain;
info->new_local_var_chain = NULL;
walk_body (convert_tramp_reference_stmt, convert_tramp_reference_op,
info, gimple_omp_body (stmt));
if (info->new_local_var_chain)
declare_vars (info->new_local_var_chain,
gimple_seq_first_stmt (gimple_omp_body (stmt)),
false);
info->new_local_var_chain = save_local_var_chain;
}
break;
default:
*handled_ops_p = false;
return NULL_TREE;
break;
}
*handled_ops_p = false;
*handled_ops_p = true;
return NULL_TREE;
}

5
libgomp/ChangeLog
View File

@ -1,3 +1,8 @@
2012-03-22 Jakub Jelinek <jakub@redhat.com>
PR middle-end/52547
* testsuite/libgomp.c/pr52547.c: New test.
2012-03-16 Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
* testsuite/lib/libgomp.exp: load fortran-modules.exp

36
libgomp/testsuite/libgomp.c/pr52547.c Normal file
View File

@ -0,0 +1,36 @@
/* PR middle-end/52547 */
/* { dg-do run } */
extern void abort (void);
__attribute__((noinline, noclone)) int
baz (int *x, int (*fn) (int *))
{
return fn (x);
}
__attribute__((noinline, noclone)) int
foo (int x, int *y)
{
int i, e = 0;
#pragma omp parallel for reduction(|:e)
for (i = 0; i < x; ++i)
{
__label__ lab;
int bar (int *z) { return z - y; }
if (baz (&y[i], bar) != i)
e |= 1;
}
return e;
}
int
main ()
{
int a[100], i;
for (i = 0; i < 100; i++)
a[i] = i;
if (foo (100, a))
abort ();
return 0;
}