r268245 - in /trunk/gcc: c/ChangeLog c/c-typeck...

[jakub@gcc.gnu.org]

Author: jakub
Date: Thu Jan 24 19:16:21 2019
New Revision: 268245

URL: https://gcc.gnu.org/viewcvs?rev=268245&root=gcc&view=rev
Log:
	PR c++/88976
	* c-typeck.c (c_finish_omp_cancel): Diagnose more than one if
	on #pragma omp cancel with different modifiers.

	* semantics.c (finish_omp_cancel): Diagnose more than one if
	on #pragma omp cancel with different modifiers.  Use
	maybe_convert_cond when not in template or build_x_binary_op
	otherwise.

	* c-c++-common/gomp/cancel-2.c: New test.
	* gcc.dg/gomp/cancel-1.c: New test.
	* g++.dg/gomp/cancel-1.C: New test.
	* g++.dg/gomp/cancel-2.C: New test.
	* g++.dg/gomp/cancel-3.C: New test.

Added:
    trunk/gcc/testsuite/c-c++-common/gomp/cancel-2.c
    trunk/gcc/testsuite/g++.dg/gomp/cancel-1.C
    trunk/gcc/testsuite/g++.dg/gomp/cancel-2.C
    trunk/gcc/testsuite/g++.dg/gomp/cancel-3.C
    trunk/gcc/testsuite/gcc.dg/gomp/cancel-1.c
Modified:
    trunk/gcc/c/ChangeLog
    trunk/gcc/c/c-typeck.c
    trunk/gcc/cp/ChangeLog
    trunk/gcc/cp/semantics.c
    trunk/gcc/testsuite/ChangeLog