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

Fix potential ICE (null pointer dereference) in omp-low.c:diagnose_sb_0.

Browse Source 
gcc/
	* omp-low.c (diagnose_sb_0): Make sure label_ctx is valid to
	dereference.
	gcc/testsuite/
	* gcc.dg/cilk-plus/jump-openmp.c: New file.

From-SVN: r207722
This commit is contained in:
Thomas Schwinge 2014-02-12 15:46:08 +01:00 committed by Thomas Schwinge
parent 7b40f5cf04
commit 64e5ace535
4 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2014-02-12 Thomas Schwinge <thomas@codesourcery.com>
* omp-low.c (diagnose_sb_0): Make sure label_ctx is valid to
dereference.
2014-02-12 James Greenhalgh <james.greenhalgh@arm.com>
* config/arm/aarch-cost-tables.h (generic_extra_costs): Fix

3
gcc/omp-low.c
View File

@ -10269,7 +10269,8 @@ diagnose_sb_0 (gimple_stmt_iterator *gsi_p,
if ((branch_ctx
&& gimple_code (branch_ctx) == GIMPLE_OMP_FOR
&& gimple_omp_for_kind (branch_ctx) == GF_OMP_FOR_KIND_CILKSIMD)
|| (gimple_code (label_ctx) == GIMPLE_OMP_FOR
|| (label_ctx
&& gimple_code (label_ctx) == GIMPLE_OMP_FOR
&& gimple_omp_for_kind (label_ctx) == GF_OMP_FOR_KIND_CILKSIMD))
cilkplus_block = true;
}

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2014-02-12 Thomas Schwinge <thomas@codesourcery.com>
* gcc.dg/cilk-plus/jump-openmp.c: New file.
2014-02-12 Richard Biener <rguenther@suse.de>
PR middle-end/60092

49
gcc/testsuite/gcc.dg/cilk-plus/jump-openmp.c Normal file
View File

@ -0,0 +1,49 @@
/* { dg-do compile } */
/* { dg-options "-fcilkplus -fopenmp" } */
/* { dg-require-effective-target fopenmp } */
int *a, *b, c;
void foo()
{
#pragma simd
for (int i=0; i < 1000; ++i)
{
a[i] = b[i];
if (c == 5)
return; /* { dg-error "invalid branch to/from a Cilk Plus structured block" } */
}
}
void bar()
{
#pragma simd
for (int i=0; i < 1000; ++i)
{
lab:
a[i] = b[i];
}
if (c == 6)
goto lab; /* { dg-error "invalid entry to Cilk Plus structured block" } */
}
void baz()
{
bad1:
#pragma omp parallel
goto bad1; /* { dg-error "invalid branch to/from an OpenMP structured block" } */
goto bad2; /* { dg-error "invalid entry to OpenMP structured block" } */
#pragma omp parallel
{
bad2: ;
}
#pragma omp parallel
{
int i;
goto ok1;
for (i = 0; i < 10; ++i)
{ ok1: break; }
}
}