Commit 87a004d0 authored by Alexey Bataev's avatar Alexey Bataev
Browse files

[OpenMP] Fix formatting of OpenMP error message, by Wang Tianqing. 

Summary: `getListOfPossibleValues()` formatted incorrectly when there is only one value, emitting something like `expected 'conditional' or  in OpenMP clause 'lastprivate'`.

Reviewers: jdoerfert, ABataev

Reviewed By: jdoerfert

Subscribers: guansong, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D71884
parent a4f3847f

clang/lib/Sema/SemaOpenMP.cpp

+2 −3
Original line number Diff line number Diff line
@@ -11933,7 +11933,6 @@ getListOfPossibleValues(OpenMPClauseKind K, unsigned First, unsigned Last, 
                        ArrayRef<unsigned> Exclude = llvm::None) {

  SmallString<256> Buffer;

  llvm::raw_svector_ostream Out(Buffer);

  unsigned Bound = Last >= 2 ? Last - 2 : 0;

  unsigned Skipped = Exclude.size();

  auto S = Exclude.begin(), E = Exclude.end();

  for (unsigned I = First; I < Last; ++I) {
@@ -11942,9 +11941,9 @@ getListOfPossibleValues(OpenMPClauseKind K, unsigned First, unsigned Last, 
      continue;

    }

    Out << "'" << getOpenMPSimpleClauseTypeName(K, I) << "'";

    if (I == Bound - Skipped)

    if (I + Skipped + 2 == Last)

      Out << " or ";

    else if (I != Bound + 1 - Skipped)

    else if (I + Skipped + 1 != Last)

      Out << ", ";

  }

  return Out.str();

clang/test/OpenMP/for_lastprivate_messages.cpp

+4 −0
Original line number Diff line number Diff line
@@ -107,6 +107,10 @@ int foomain(int argc, char **argv) { 
  for (int k = 0; k < argc; ++k)

    ++k;

#pragma omp parallel

#pragma omp for lastprivate(foo:argc) // omp50-error {{expected 'conditional' in OpenMP clause 'lastprivate'}} omp45-error {{expected ',' or ')' in 'lastprivate' clause}} omp45-error {{expected ')'}} omp45-error {{expected variable name}} omp45-note {{to match this '('}}

  for (int k = 0; k < argc; ++k)

    ++k;

#pragma omp parallel

#pragma omp for lastprivate(conditional: argc,s) lastprivate(conditional: // omp45-error 2 {{use of undeclared identifier 'conditional'}} omp50-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} omp45-error 2 {{calling a private constructor of class 'S6'}} omp50-error {{expected list item of scalar type in 'lastprivate' clause with 'conditional' modifier}}

  for (int k = 0; k < argc; ++k)

    ++k;

clang/test/OpenMP/for_simd_lastprivate_messages.cpp

+4 −0
Original line number Diff line number Diff line
@@ -111,6 +111,10 @@ int foomain(int argc, char **argv) { 
  for (int k = 0; k < argc; ++k)

    ++k;

#pragma omp parallel

#pragma omp for simd lastprivate(foo:argc) // omp50-error {{expected 'conditional' in OpenMP clause 'lastprivate'}} omp45-error {{expected ',' or ')' in 'lastprivate' clause}} omp45-error {{expected ')'}} omp45-error {{expected variable name}} omp45-note {{to match this '('}}

  for (int k = 0; k < argc; ++k)

    ++k;

#pragma omp parallel

#pragma omp for simd lastprivate(z, a, b) // expected-error {{lastprivate variable with incomplete type 'S1'}}

  for (int k = 0; k < argc; ++k)

    ++k;

clang/test/OpenMP/parallel_for_lastprivate_messages.cpp

+3 −0
Original line number Diff line number Diff line
@@ -98,6 +98,9 @@ int foomain(int argc, char **argv) { 
#pragma omp parallel for lastprivate(conditional: argc,s) lastprivate(conditional: // omp50-error {{expected expression}} omp45-error 2 {{use of undeclared identifier 'conditional'}} expected-error {{expected ')'}} expected-note {{to match this '('}} omp45-error 2 {{calling a private constructor of class 'S6'}} omp50-error {{expected list item of scalar type in 'lastprivate' clause with 'conditional' modifier}}

  for (int k = 0; k < argc; ++k)

    ++k;

#pragma omp parallel for lastprivate(foo:argc) // omp50-error {{expected 'conditional' in OpenMP clause 'lastprivate'}} omp45-error {{expected ',' or ')' in 'lastprivate' clause}} omp45-error {{expected ')'}} omp45-error {{expected variable name}} omp45-note {{to match this '('}}

  for (int k = 0; k < argc; ++k)

    ++k;

#pragma omp parallel for lastprivate(S1) // expected-error {{'S1' does not refer to a value}}

  for (int k = 0; k < argc; ++k)

    ++k;

clang/test/OpenMP/parallel_for_simd_lastprivate_messages.cpp

+3 −0
Original line number Diff line number Diff line
@@ -97,6 +97,9 @@ int foomain(int argc, char **argv) { 
#pragma omp parallel for simd lastprivate(conditional: s,argc) lastprivate(conditional: // omp50-error {{expected expression}} omp45-error 2 {{use of undeclared identifier 'conditional'}} expected-error {{expected ')'}} expected-note {{to match this '('}} omp50-error {{expected list item of scalar type in 'lastprivate' clause with 'conditional' modifier}}

  for (int k = 0; k < argc; ++k)

    ++k;

#pragma omp parallel for simd lastprivate(foo:argc) // omp50-error {{expected 'conditional' in OpenMP clause 'lastprivate'}} omp45-error {{expected ',' or ')' in 'lastprivate' clause}} omp45-error {{expected ')'}} omp45-error {{expected variable name}} omp45-note {{to match this '('}}

  for (int k = 0; k < argc; ++k)

    ++k;

#pragma omp parallel for simd lastprivate(S1) // expected-error {{'S1' does not refer to a value}}

  for (int k = 0; k < argc; ++k)

    ++k;