mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-16 10:10:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix OpenMP's target update directive in templated code.

Browse Source 
FAIL: g++.dg/gomp/tpl-target-update.C  -std=c++98 (internal compiler error)
    FAIL: g++.dg/gomp/tpl-target-update.C  -std=c++98 (test for excess errors)
    FAIL: g++.dg/gomp/tpl-target-update.C  -std=c++11 (internal compiler error)
    FAIL: g++.dg/gomp/tpl-target-update.C  -std=c++11 (test for excess errors)
    FAIL: g++.dg/gomp/tpl-target-update.C  -std=c++14 (internal compiler error)
    FAIL: g++.dg/gomp/tpl-target-update.C  -std=c++14 (test for excess errors)

    [...]/source-gcc/gcc/testsuite/g++.dg/gomp/tpl-target-update.C: In instantiation of 'void f(T, T) [with T = int]':
    [...]/source-gcc/gcc/testsuite/g++.dg/gomp/tpl-target-update.C:19:9:   required from here
    [...]/source-gcc/gcc/testsuite/g++.dg/gomp/tpl-target-update.C:10:9: internal compiler error: tree check: expected oacc_parallel or oacc_kernels or oacc_data or oacc_host_data or omp_parallel or omp_task or omp_for or omp_simd or cilk_simd or cilk_for or omp_distribute or oacc_loop or omp_teams or omp_target_data or omp_target or omp_sections or omp_single, have omp_target_update in tsubst_expr, at cp/pt.c:14209
    0xf5aae1 tree_range_check_failed(tree_node const*, char const*, int, char const*, tree_code, tree_code)
            [...]/source-gcc/gcc/tree.c:9384
    0x66e201 tree_range_check
            [...]/source-gcc/gcc/tree.h:2979
    0x66e201 tsubst_expr
            [...]/source-gcc/gcc/cp/pt.c:14209
    0x6695e3 tsubst_expr
            [...]/source-gcc/gcc/cp/pt.c:13752
    0x66ac07 tsubst_expr
            [...]/source-gcc/gcc/cp/pt.c:13938
    0x667c41 instantiate_decl(tree_node*, int, bool)
            [...]/source-gcc/gcc/cp/pt.c:20367
    0x6ae386 instantiate_pending_templates(int)
            [...]/source-gcc/gcc/cp/pt.c:20484
    0x6edc3d cp_write_global_declarations()
            [...]/source-gcc/gcc/cp/decl2.c:4456

	gcc/cp/
	* pt.c (tsubst_expr) <OMP_TARGET_UPDATE>: Use
	OMP_TARGET_UPDATE_CLAUSES instead of OMP_CLAUSES.
	gcc/testsuite/
	* g++.dg/gomp/tpl-target-update.C: New file.

From-SVN: r222564
This commit is contained in:
Thomas Schwinge 2015-04-29 11:04:31 +02:00 committed by Thomas Schwinge
parent b504063421
commit 2c8f068300
4 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2015-04-29 Thomas Schwinge <thomas@codesourcery.com>
* pt.c (tsubst_expr) <OMP_TARGET_UPDATE>: Use
OMP_TARGET_UPDATE_CLAUSES instead of OMP_CLAUSES.
2015-04-28 Jason Merrill <jason@redhat.com> 2015-04-28 Jason Merrill <jason@redhat.com>
PR c++/65896 PR c++/65896

2
gcc/cp/pt.c
View File

@ -14203,7 +14203,7 @@ tsubst_expr (tree t, tree args, tsubst_flags_t complain, tree in_decl,
tmp = tsubst_omp_clauses (OMP_TARGET_UPDATE_CLAUSES (t), false, tmp = tsubst_omp_clauses (OMP_TARGET_UPDATE_CLAUSES (t), false,
args, complain, in_decl); args, complain, in_decl);
t = copy_node (t); t = copy_node (t);
OMP_CLAUSES (t) = tmp; OMP_TARGET_UPDATE_CLAUSES (t) = tmp;
add_stmt (t); add_stmt (t);
break; break;

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2015-04-29 Thomas Schwinge <thomas@codesourcery.com>
* g++.dg/gomp/tpl-target-update.C: New file.
2015-04-29 Richard Biener <rguenther@suse.de> 2015-04-29 Richard Biener <rguenther@suse.de>
PR tree-optimization/65917 PR tree-optimization/65917

20
gcc/testsuite/g++.dg/gomp/tpl-target-update.C Normal file
View File

@ -0,0 +1,20 @@
// { dg-do compile }
template <typename T>
void f(T A, T B)
{
extern int *v;
T a = 2;
T b = 4;
#pragma omp target update to(v[a:b])
v[a] = 0;
#pragma omp target update to(v[A:B])
v[a] = 0;
}
void g()
{
f(1, 5);
}