* cp-tree.h (omp_declare_variant_finalize, build_local_temp): Declare.
	* decl.c: Include omp-general.h.
	(declare_simd_adjust_this): Add forward declaration.
	(omp_declare_variant_finalize_one, omp_declare_variant_finalize): New
	function.
	(cp_finish_decl, finish_function): Call omp_declare_variant_finalize.
	* parser.c (cp_finish_omp_declare_variant): Adjust parsing of the
	variant id-expression and propagate enough information to
	omp_declare_variant_finalize_one in the attribute so that it can
	finalize it.
	* class.c (finish_struct): Call omp_declare_variant_finalize.
	* tree.c (build_local_temp): No longer static, remove forward
	declaration.

	* c-c++-common/gomp/declare-variant-2.c: Add a test with , before
	match clause.
	* c-c++-common/gomp/declare-variant-6.c: Expect diagnostics also from
	C++ FE and adjust regexp so that it handles C++ pretty printing of
	function names.
	* g++.dg/gomp/declare-variant-1.C: New test.
	* g++.dg/gomp/declare-variant-2.C: New test.
	* g++.dg/gomp/declare-variant-3.C: New test.
	* g++.dg/gomp/declare-variant-4.C: New test.
	* g++.dg/gomp/declare-variant-5.C: New test.

From-SVN: r277613