This is an archive of the discontinued LLVM Phabricator instance.

Differential D78637

[OPENMP]Fix PR45383: type dependent array subscripts are diagnosed erroneously.
ClosedPublic

Authored by ABataev on Apr 22 2020, 7:20 AM.

Details

Reviewers
jdoerfert
Commits
rG3c191ae555cc: [OPENMP]Fix PR45383: type dependent array subscripts are diagnosed erroneously.
Summary

If the array subscript expression is type depent, its analysis must be
delayed before its instantiation.

Diff Detail

Event Timeline

ABataev created this revision.Apr 22 2020, 7:20 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 22 2020, 7:21 AM
Herald added subscribers: guansong, yaxunl. · View Herald Transcript
jdoerfert added a comment.Apr 22 2020, 8:53 AM

Can we merge the test changes into D78643 and continue with D78643 as a fix?

Harbormaster failed remote builds in B54243: Diff 259282!Apr 22 2020, 9:13 AM
ABataev updated this revision to Diff 268196.Jun 3 2020, 7:40 AM

Rebase

Harbormaster failed remote builds in B58927: Diff 268196!Jun 3 2020, 9:53 AM
jdoerfert accepted this revision.Jun 3 2020, 12:12 PM

LGTM

This revision is now accepted and ready to land.Jun 3 2020, 12:12 PM
Closed by commit rG3c191ae555cc: [OPENMP]Fix PR45383: type dependent array subscripts are diagnosed erroneously. (authored by ABataev). · Explain WhyJun 4 2020, 6:36 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang/
lib/
Sema/
2 lines
test/
OpenMP/
12 lines

Diff 268196

clang/lib/Sema/SemaOpenMP.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 16,122 Lines • ▼ Show 20 Lines if (DepKind == OMPC_DEPEND_sink) {
Diag(ELoc, diag::err_omp_expected_addressable_lvalue_or_array_item) Diag(ELoc, diag::err_omp_expected_addressable_lvalue_or_array_item)
<< (LangOpts.OpenMP >= 50 ? 1 : 0) << 1 << (LangOpts.OpenMP >= 50 ? 1 : 0) << 1
<< RefExpr->getSourceRange(); << RefExpr->getSourceRange();
continue; continue;
} }
auto *ASE = dyn_cast<ArraySubscriptExpr>(SimpleExpr); auto *ASE = dyn_cast<ArraySubscriptExpr>(SimpleExpr);
if (!RefExpr->IgnoreParenImpCasts()->isLValue() || if (!RefExpr->IgnoreParenImpCasts()->isLValue() ||
(ASE && (ASE && !ASE->getBase()->isTypeDependent() &&
!ASE->getBase() !ASE->getBase()
->getType() ->getType()
.getNonReferenceType() .getNonReferenceType()
->isPointerType() && ->isPointerType() &&
!ASE->getBase()->getType().getNonReferenceType()->isArrayType())) { !ASE->getBase()->getType().getNonReferenceType()->isArrayType())) {
Diag(ELoc, diag::err_omp_expected_addressable_lvalue_or_array_item) Diag(ELoc, diag::err_omp_expected_addressable_lvalue_or_array_item)
<< (LangOpts.OpenMP >= 50 ? 1 : 0) << (LangOpts.OpenMP >= 50 ? 1 : 0)
<< (LangOpts.OpenMP >= 50 ? 1 : 0) << RefExpr->getSourceRange(); << (LangOpts.OpenMP >= 50 ? 1 : 0) << RefExpr->getSourceRange();
▲ Show 20 Lines • Show All 2,751 Lines • Show Last 20 Lines

clang/test/OpenMP/task_ast_print.cpp

// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=50 -ast-print %s | FileCheck %s // RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=50 -ast-print %s | FileCheck %s
Lint: Lint
Inline Actions

clang-format suggested style edits found:

Lint: Lint: clang-format suggested style edits found:
// RUN: %clang_cc1 -fopenmp -fopenmp-version=50 -x c++ -std=c++11 -emit-pch -o %t %s // RUN: %clang_cc1 -fopenmp -fopenmp-version=50 -x c++ -std=c++11 -emit-pch -o %t %s
// RUN: %clang_cc1 -fopenmp -fopenmp-version=50 -std=c++11 -include-pch %t -fsyntax-only -verify %s -ast-print | FileCheck %s // RUN: %clang_cc1 -fopenmp -fopenmp-version=50 -std=c++11 -include-pch %t -fsyntax-only -verify %s -ast-print | FileCheck %s
// RUN: %clang_cc1 -verify -fopenmp-simd -fopenmp-version=50 -ast-print %s | FileCheck %s // RUN: %clang_cc1 -verify -fopenmp-simd -fopenmp-version=50 -ast-print %s | FileCheck %s
// RUN: %clang_cc1 -fopenmp-simd -fopenmp-version=50 -x c++ -std=c++11 -emit-pch -o %t %s // RUN: %clang_cc1 -fopenmp-simd -fopenmp-version=50 -x c++ -std=c++11 -emit-pch -o %t %s
// RUN: %clang_cc1 -fopenmp-simd -fopenmp-version=50 -std=c++11 -include-pch %t -fsyntax-only -verify %s -ast-print | FileCheck %s // RUN: %clang_cc1 -fopenmp-simd -fopenmp-version=50 -std=c++11 -include-pch %t -fsyntax-only -verify %s -ast-print | FileCheck %s
// expected-no-diagnostics // expected-no-diagnostics
▲ Show 20 Lines • Show All 84 Lines • ▼ Show 20 Lines
template <typename T, int C> template <typename T, int C>
T tmain(T argc, T *argv) { T tmain(T argc, T *argv) {
T b = argc, c, d, e, f, g; T b = argc, c, d, e, f, g;
static T a; static T a;
S<T> s; S<T> s;
T arr[argc]; T arr[argc];
omp_depend_t x; omp_depend_t x;
omp_event_handle_t evt; omp_event_handle_t evt;
#pragma omp task untied depend(in : argc, argv[b:argc], arr[:], ([argc][sizeof(T)])argv) if (task : argc > 0) depend(depobj: x) detach(evt) double *arr_double;
#pragma omp task untied depend(in : argc, argv[b:argc], arr[:], ([argc][sizeof(T)])argv, arr_double[argc]) if (task : argc > 0) depend(depobj: x) detach(evt)
Lint: Pre-merge checks
Inline Actions

clang-format: please reformat the code

-#pragma omp task untied depend(in : argc, argv[b:argc], arr[:], ([argc][sizeof(T)])argv, arr_double[argc]) if (task : argc > 0) depend(depobj: x) detach(evt)
+#pragma omp task untied depend(in                                                                                                      \
+                               : argc, argv [b:argc], arr[:], ([argc][sizeof(T)])argv, arr_double[argc]) if (task                      \
+                                                                                                             : argc > 0) depend(depobj \
+                                                                                                                                : x) detach(evt)
Lint: Pre-merge checks: clang-format: please reformat the code ``` -#pragma omp task untied depend(in : argc, argv[b…
a = 2; a = 2;
#pragma omp task default(none), private(argc, b) firstprivate(argv) shared(d) if (argc > 0) final(S<T>::TS > 0) priority(argc) affinity(argc, argv[b:argc], arr[:], ([argc][sizeof(T)])argv) #pragma omp task default(none), private(argc, b) firstprivate(argv) shared(d) if (argc > 0) final(S<T>::TS > 0) priority(argc) affinity(argc, argv[b:argc], arr[:], ([argc][sizeof(T)])argv)
foo(); foo();
#pragma omp taskgroup task_reduction(-: argc) #pragma omp taskgroup task_reduction(-: argc)
#pragma omp task if (C) mergeable priority(C) in_reduction(-: argc) #pragma omp task if (C) mergeable priority(C) in_reduction(-: argc)
foo(); foo();
return 0; return 0;
} }
// CHECK: template <typename T, int C> T tmain(T argc, T *argv) { // CHECK: template <typename T, int C> T tmain(T argc, T *argv) {
// CHECK-NEXT: T b = argc, c, d, e, f, g; // CHECK-NEXT: T b = argc, c, d, e, f, g;
// CHECK-NEXT: static T a; // CHECK-NEXT: static T a;
// CHECK-NEXT: S<T> s; // CHECK-NEXT: S<T> s;
// CHECK-NEXT: T arr[argc]; // CHECK-NEXT: T arr[argc];
// CHECK-NEXT: omp_depend_t x; // CHECK-NEXT: omp_depend_t x;
// CHECK-NEXT: omp_event_handle_t evt; // CHECK-NEXT: omp_event_handle_t evt;
// CHECK-NEXT: #pragma omp task untied depend(in : argc,argv[b:argc],arr[:],([argc][sizeof(T)])argv) if(task: argc > 0) depend(depobj : x) detach(evt) // CHECK-NEXT: double *arr_double;
// CHECK-NEXT: #pragma omp task untied depend(in : argc,argv[b:argc],arr[:],([argc][sizeof(T)])argv,arr_double[argc]) if(task: argc > 0) depend(depobj : x) detach(evt)
// CHECK-NEXT: a = 2; // CHECK-NEXT: a = 2;
// CHECK-NEXT: #pragma omp task default(none) private(argc,b) firstprivate(argv) shared(d) if(argc > 0) final(S<T>::TS > 0) priority(argc) affinity(argc,argv[b:argc],arr[:],([argc][sizeof(T)])argv) // CHECK-NEXT: #pragma omp task default(none) private(argc,b) firstprivate(argv) shared(d) if(argc > 0) final(S<T>::TS > 0) priority(argc) affinity(argc,argv[b:argc],arr[:],([argc][sizeof(T)])argv)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp taskgroup task_reduction(-: argc) // CHECK-NEXT: #pragma omp taskgroup task_reduction(-: argc)
// CHECK-NEXT: #pragma omp task if(C) mergeable priority(C) in_reduction(-: argc) // CHECK-NEXT: #pragma omp task if(C) mergeable priority(C) in_reduction(-: argc)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK: template<> int tmain<int, 5>(int argc, int *argv) { // CHECK: template<> int tmain<int, 5>(int argc, int *argv) {
// CHECK-NEXT: int b = argc, c, d, e, f, g; // CHECK-NEXT: int b = argc, c, d, e, f, g;
// CHECK-NEXT: static int a; // CHECK-NEXT: static int a;
// CHECK-NEXT: S<int> s; // CHECK-NEXT: S<int> s;
// CHECK-NEXT: int arr[argc]; // CHECK-NEXT: int arr[argc];
// CHECK-NEXT: omp_depend_t x; // CHECK-NEXT: omp_depend_t x;
// CHECK-NEXT: omp_event_handle_t evt; // CHECK-NEXT: omp_event_handle_t evt;
// CHECK-NEXT: #pragma omp task untied depend(in : argc,argv[b:argc],arr[:],([argc][sizeof(int)])argv) if(task: argc > 0) depend(depobj : x) detach(evt) // CHECK-NEXT: double *arr_double;
// CHECK-NEXT: #pragma omp task untied depend(in : argc,argv[b:argc],arr[:],([argc][sizeof(int)])argv,arr_double[argc]) if(task: argc > 0) depend(depobj : x) detach(evt)
// CHECK-NEXT: a = 2; // CHECK-NEXT: a = 2;
// CHECK-NEXT: #pragma omp task default(none) private(argc,b) firstprivate(argv) shared(d) if(argc > 0) final(S<int>::TS > 0) priority(argc) affinity(argc,argv[b:argc],arr[:],([argc][sizeof(int)])argv) // CHECK-NEXT: #pragma omp task default(none) private(argc,b) firstprivate(argv) shared(d) if(argc > 0) final(S<int>::TS > 0) priority(argc) affinity(argc,argv[b:argc],arr[:],([argc][sizeof(int)])argv)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp taskgroup task_reduction(-: argc) // CHECK-NEXT: #pragma omp taskgroup task_reduction(-: argc)
// CHECK-NEXT: #pragma omp task if(5) mergeable priority(5) in_reduction(-: argc) // CHECK-NEXT: #pragma omp task if(5) mergeable priority(5) in_reduction(-: argc)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK: template<> long tmain<long, 1>(long argc, long *argv) { // CHECK: template<> long tmain<long, 1>(long argc, long *argv) {
// CHECK-NEXT: long b = argc, c, d, e, f, g; // CHECK-NEXT: long b = argc, c, d, e, f, g;
// CHECK-NEXT: static long a; // CHECK-NEXT: static long a;
// CHECK-NEXT: S<long> s; // CHECK-NEXT: S<long> s;
// CHECK-NEXT: long arr[argc]; // CHECK-NEXT: long arr[argc];
// CHECK-NEXT: omp_depend_t x; // CHECK-NEXT: omp_depend_t x;
// CHECK-NEXT: omp_event_handle_t evt; // CHECK-NEXT: omp_event_handle_t evt;
// CHECK-NEXT: #pragma omp task untied depend(in : argc,argv[b:argc],arr[:],([argc][sizeof(long)])argv) if(task: argc > 0) depend(depobj : x) detach(evt) // CHECK-NEXT: double *arr_double;
// CHECK-NEXT: #pragma omp task untied depend(in : argc,argv[b:argc],arr[:],([argc][sizeof(long)])argv,arr_double[argc]) if(task: argc > 0) depend(depobj : x) detach(evt)
// CHECK-NEXT: a = 2; // CHECK-NEXT: a = 2;
// CHECK-NEXT: #pragma omp task default(none) private(argc,b) firstprivate(argv) shared(d) if(argc > 0) final(S<long>::TS > 0) priority(argc) affinity(argc,argv[b:argc],arr[:],([argc][sizeof(long)])argv) // CHECK-NEXT: #pragma omp task default(none) private(argc,b) firstprivate(argv) shared(d) if(argc > 0) final(S<long>::TS > 0) priority(argc) affinity(argc,argv[b:argc],arr[:],([argc][sizeof(long)])argv)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp taskgroup task_reduction(-: argc) // CHECK-NEXT: #pragma omp taskgroup task_reduction(-: argc)
// CHECK-NEXT: #pragma omp task if(1) mergeable priority(1) in_reduction(-: argc) // CHECK-NEXT: #pragma omp task if(1) mergeable priority(1) in_reduction(-: argc)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
enum Enum {}; enum Enum {};
Show All 40 Lines