r207847 - in /branches/gomp-4_0-branch/gcc: Cha...

[tschwinge@gcc.gnu.org]

Author: tschwinge
Date: Tue Feb 18 16:24:58 2014
New Revision: 207847

URL: http://gcc.gnu.org/viewcvs?rev=207847&root=gcc&view=rev
Log:
Generalize diagnose_omp_blocks' structured block logic.

	gcc/
	* omp-low.c (diagnose_sb_0): Generalize detection which kind of
	structured block we're in.
	gcc/testsuite/
	* g++.dg/gomp/block-1.C: Adjust to changed error message and/or
	tighten matching rules.
	* g++.dg/gomp/block-2.C: Likewise.
	* g++.dg/gomp/block-3.C: Likewise.
	* g++.dg/gomp/block-5.C: Likewise.
	* g++.dg/gomp/target-1.C: Likewise.
	* g++.dg/gomp/target-2.C: Likewise.
	* g++.dg/gomp/taskgroup-1.C: Likewise.
	* g++.dg/gomp/teams-1.C: Likewise.
	* gcc.dg/cilk-plus/jump-openmp.c: Likewise.
	* gcc.dg/cilk-plus/jump.c: Likewise.
	* gcc.dg/gomp/block-1.c: Likewise.
	* gcc.dg/gomp/block-10.c: Likewise.
	* gcc.dg/gomp/block-2.c: Likewise.
	* gcc.dg/gomp/block-3.c: Likewise.
	* gcc.dg/gomp/block-4.c: Likewise.
	* gcc.dg/gomp/block-5.c: Likewise.
	* gcc.dg/gomp/block-6.c: Likewise.
	* gcc.dg/gomp/block-7.c: Likewise.
	* gcc.dg/gomp/block-8.c: Likewise.
	* gcc.dg/gomp/block-9.c: Likewise.
	* gcc.dg/gomp/target-1.c: Likewise.
	* gcc.dg/gomp/target-2.c: Likewise.
	* gcc.dg/gomp/taskgroup-1.c: Likewise.
	* gcc.dg/gomp/teams-1.c: Likewise.

Modified:
    branches/gomp-4_0-branch/gcc/ChangeLog.gomp
    branches/gomp-4_0-branch/gcc/omp-low.c
    branches/gomp-4_0-branch/gcc/testsuite/ChangeLog.gomp
    branches/gomp-4_0-branch/gcc/testsuite/g++.dg/gomp/block-1.C
    branches/gomp-4_0-branch/gcc/testsuite/g++.dg/gomp/block-2.C
    branches/gomp-4_0-branch/gcc/testsuite/g++.dg/gomp/block-3.C
    branches/gomp-4_0-branch/gcc/testsuite/g++.dg/gomp/block-5.C
    branches/gomp-4_0-branch/gcc/testsuite/g++.dg/gomp/target-1.C
    branches/gomp-4_0-branch/gcc/testsuite/g++.dg/gomp/target-2.C
    branches/gomp-4_0-branch/gcc/testsuite/g++.dg/gomp/taskgroup-1.C
    branches/gomp-4_0-branch/gcc/testsuite/g++.dg/gomp/teams-1.C
    branches/gomp-4_0-branch/gcc/testsuite/gcc.dg/cilk-plus/jump-openmp.c
    branches/gomp-4_0-branch/gcc/testsuite/gcc.dg/cilk-plus/jump.c
    branches/gomp-4_0-branch/gcc/testsuite/gcc.dg/gomp/block-1.c
    branches/gomp-4_0-branch/gcc/testsuite/gcc.dg/gomp/block-10.c
    branches/gomp-4_0-branch/gcc/testsuite/gcc.dg/gomp/block-2.c
    branches/gomp-4_0-branch/gcc/testsuite/gcc.dg/gomp/block-3.c
    branches/gomp-4_0-branch/gcc/testsuite/gcc.dg/gomp/block-4.c
    branches/gomp-4_0-branch/gcc/testsuite/gcc.dg/gomp/block-5.c
    branches/gomp-4_0-branch/gcc/testsuite/gcc.dg/gomp/block-6.c
    branches/gomp-4_0-branch/gcc/testsuite/gcc.dg/gomp/block-7.c
    branches/gomp-4_0-branch/gcc/testsuite/gcc.dg/gomp/block-8.c
    branches/gomp-4_0-branch/gcc/testsuite/gcc.dg/gomp/block-9.c
    branches/gomp-4_0-branch/gcc/testsuite/gcc.dg/gomp/target-1.c
    branches/gomp-4_0-branch/gcc/testsuite/gcc.dg/gomp/target-2.c
    branches/gomp-4_0-branch/gcc/testsuite/gcc.dg/gomp/taskgroup-1.c
    branches/gomp-4_0-branch/gcc/testsuite/gcc.dg/gomp/teams-1.c