r239133 - in /branches/gomp-4_0-branch/gcc: c/C...

[tschwinge@gcc.gnu.org]

Author: tschwinge
Date: Thu Aug  4 13:49:59 2016
New Revision: 239133

URL: https://gcc.gnu.org/viewcvs?rev=239133&root=gcc&view=rev
Log:
Rework C/C++ OpenACC routine parsing

Backport trunk r239128:

	gcc/c/
	* c-parser.c (struct oacc_routine_data): Add error_seen and
	fndecl_seen members.
	(c_finish_oacc_routine): Use these.
	(c_parser_declaration_or_fndef): Adjust.
	(c_parser_oacc_routine): Likewise.  Support more C language
	constructs, and improve diagnostics.  Move pragma context
	checking...
	(c_parser_pragma): ... here.
	gcc/cp/
	* parser.c (cp_ensure_no_oacc_routine): Improve diagnostics.
	(cp_parser_late_parsing_cilk_simd_fn_info): Fix diagnostics.
	(cp_parser_late_parsing_oacc_routine, cp_finalize_oacc_routine):
	Simplify code, and improve diagnostics.
	(cp_parser_oacc_routine): Likewise.  Move pragma context
	checking...
	(cp_parser_pragma): ... here.
	gcc/testsuite/
	* c-c++-common/goacc/routine-5.c: Update.

	gcc/testsuite/
	* g++.dg/goacc/routine-2.C: Update.

Modified:
    branches/gomp-4_0-branch/gcc/c/ChangeLog.gomp
    branches/gomp-4_0-branch/gcc/c/c-parser.c
    branches/gomp-4_0-branch/gcc/cp/ChangeLog.gomp
    branches/gomp-4_0-branch/gcc/cp/parser.c
    branches/gomp-4_0-branch/gcc/testsuite/ChangeLog.gomp
    branches/gomp-4_0-branch/gcc/testsuite/c-c++-common/goacc/routine-5.c
    branches/gomp-4_0-branch/gcc/testsuite/g++.dg/goacc/routine-2.C