Author: abataev
Date: Tue Feb 27 09:42:00 2018
New Revision: 326212
URL: http://llvm.org/viewvc/llvm-project?rev=326212&view=rev
Log:
[OPENMP] Allow multiple mappings for member expressions for pointers.
If several member expressions are mapped and they reference the same
address as a base, but access different members, this must be allowed.
Modified:
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
cfe/trunk/lib/Sema/SemaOpenMP.cpp
cfe/trunk/test/OpenMP/target_map_messages.cpp
cfe/trunk/test/OpenMP/target_teams_map_messages.cpp
Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=326212&r1=326211&r2=326212&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Tue Feb 27 09:42:00
2018
@@ -8646,8 +8646,8 @@ def err_omp_pointer_mapped_along_with_de
"pointer cannot be mapped along with a section derived from itself">;
def err_omp_original_storage_is_shared_and_does_not_contain : Error<
"original storage of expression in data environment is shared but data
environment do not fully contain mapped expression storage">;
-def err_omp_same_pointer_derreferenced : Error<
- "same pointer derreferenced in multiple different ways in map clause
expressions">;
+def err_omp_same_pointer_dereferenced : Error<
+ "same pointer dereferenced in multiple different ways in map clause
expressions">;
def note_omp_task_predetermined_firstprivate_here : Note<
"predetermined as a firstprivate in a task construct here">;
def err_omp_threadprivate_incomplete_type : Error<
Modified: cfe/trunk/lib/Sema/SemaOpenMP.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOpenMP.cpp?rev=326212&r1=326211&r2=326212&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaOpenMP.cpp (original)
+++ cfe/trunk/lib/Sema/SemaOpenMP.cpp Tue Feb 27 09:42:00 2018
@@ -11987,14 +11987,20 @@ static bool CheckMapConflicts(
DerivedLoc,
diag::err_omp_pointer_mapped_along_with_derived_section)
<< DerivedLoc;
- } else {
+ SemaRef.Diag(RE->getExprLoc(), diag::note_used_here)
+ << RE->getSourceRange();
+ return true;
+ } else if (CI->getAssociatedExpression()->getStmtClass() !=
+ SI->getAssociatedExpression()->getStmtClass() ||
+ CI->getAssociatedDeclaration()->getCanonicalDecl() ==
+ SI->getAssociatedDeclaration()->getCanonicalDecl()) {
assert(CI != CE && SI != SE);
- SemaRef.Diag(DerivedLoc, diag::err_omp_same_pointer_derreferenced)
+ SemaRef.Diag(DerivedLoc, diag::err_omp_same_pointer_dereferenced)
<< DerivedLoc;
+ SemaRef.Diag(RE->getExprLoc(), diag::note_used_here)
+ << RE->getSourceRange();
+ return true;
}
- SemaRef.Diag(RE->getExprLoc(), diag::note_used_here)
- << RE->getSourceRange();
- return true;
}
// OpenMP 4.5 [2.15.5.1, map Clause, Restrictions, p.4]
Modified: cfe/trunk/test/OpenMP/target_map_messages.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/target_map_messages.cpp?rev=326212&r1=326211&r2=326212&view=diff
==============================================================================
--- cfe/trunk/test/OpenMP/target_map_messages.cpp (original)
+++ cfe/trunk/test/OpenMP/target_map_messages.cpp Tue Feb 27 09:42:00 2018
@@ -235,9 +235,17 @@ void SAclient(int arg) {
{}
#pragma omp target map(r.ArrS[0].A, t.ArrS[1].A)
{}
- #pragma omp target map(r.PtrS[0], r.PtrS->B) // expected-error {{same
pointer derreferenced in multiple different ways in map clause expressions}}
expected-note {{used here}}
+ #pragma omp target map(r.PtrS[0], r.PtrS->B) // expected-error {{same
pointer dereferenced in multiple different ways in map clause expressions}}
expected-note {{used here}}
{}
- #pragma omp target map(r.RPtrS[0], r.RPtrS->B) // expected-error {{same
pointer derreferenced in multiple different ways in map clause expressions}}
expected-note {{used here}}
+ #pragma omp target map(r.PtrS, r.PtrS->B) // expected-error {{pointer cannot
be mapped along with a section derived from itself}} expected-note {{used here}}
+ {}
+ #pragma omp target map(r.PtrS->A, r.PtrS->B)
+ {}
+ #pragma omp target map(r.RPtrS[0], r.RPtrS->B) // expected-error {{same
pointer dereferenced in multiple different ways in map clause expressions}}
expected-note {{used here}}
+ {}
+ #pragma omp target map(r.RPtrS, r.RPtrS->B) // expected-error {{pointer
cannot be mapped along with a section derived from itself}} expected-note
{{used here}}
+ {}
+ #pragma omp target map(r.RPtrS->A, r.RPtrS->B)
{}
#pragma omp target map(r.S.Arr[:12])
{}
Modified: cfe/trunk/test/OpenMP/target_teams_map_messages.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/target_teams_map_messages.cpp?rev=326212&r1=326211&r2=326212&view=diff
==============================================================================
--- cfe/trunk/test/OpenMP/target_teams_map_messages.cpp (original)
+++ cfe/trunk/test/OpenMP/target_teams_map_messages.cpp Tue Feb 27 09:42:00 2018
@@ -225,9 +225,17 @@ void SAclient(int arg) {
{}
#pragma omp target teams map(r.ArrS[0].A, t.ArrS[1].A)
{}
- #pragma omp target teams map(r.PtrS[0], r.PtrS->B) // expected-error {{same
pointer derreferenced in multiple different ways in map clause expressions}}
expected-note {{used here}}
+ #pragma omp target teams map(r.PtrS[0], r.PtrS->B) // expected-error {{same
pointer dereferenced in multiple different ways in map clause expressions}}
expected-note {{used here}}
{}
- #pragma omp target teams map(r.RPtrS[0], r.RPtrS->B) // expected-error
{{same pointer derreferenced in multiple different ways in map clause
expressions}} expected-note {{used here}}
+ #pragma omp target teams map(r.PtrS, r.PtrS->B) // expected-error {{pointer
cannot be mapped along with a section derived from itself}} expected-note
{{used here}}
+ {}
+ #pragma omp target teams map(r.PtrS->A, r.PtrS->B)
+ {}
+ #pragma omp target teams map(r.RPtrS[0], r.RPtrS->B) // expected-error
{{same pointer dereferenced in multiple different ways in map clause
expressions}} expected-note {{used here}}
+ {}
+ #pragma omp target teams map(r.RPtrS, r.RPtrS->B) // expected-error
{{pointer cannot be mapped along with a section derived from itself}}
expected-note {{used here}}
+ {}
+ #pragma omp target teams map(r.RPtrS->A, r.RPtrS->B)
{}
#pragma omp target teams map(r.S.Arr[:12])
{}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
