[OPENMP] Improved diagnostic messages for vars with the predetermined data sharing attributes and reformatting

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@211262 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 158 insertions, 110 deletions

diff --git a/test/OpenMP/simd_lastprivate_messages.cpp b/test/OpenMP/simd_lastprivate_messages.cpp
index f168e6287a..647cbd80a8 100644
--- a/test/OpenMP/simd_lastprivate_messages.cpp
+++ b/test/OpenMP/simd_lastprivate_messages.cpp
@@ -11,150 +11,198 @@ struct S1; // expected-note 2 {{declared here}} expected-note 2 {{forward declar
 extern S1 a;
 class S2 {
   mutable int a;
+
 public:
-  S2():a(0) { }
-  S2(S2 &s2):a(s2.a) { }
-  static float S2s; // expected-note {{predetermined as shared}}
+  S2() : a(0) {}
+  S2(S2 &s2) : a(s2.a) {}
+  static float S2s; // expected-note {{static data member is predetermined as shared}}
   static const float S2sc;
 };
-const float S2::S2sc = 0; // expected-note {{predetermined as shared}}
+const float S2::S2sc = 0; // expected-note {{static data member is predetermined as shared}}
 const S2 b;
 const S2 ba[5];
 class S3 { // expected-note {{'S3' declared here}}
   int a;
-  S3& operator =(const S3& s3);
+  S3 &operator=(const S3 &s3);
+
 public:
-  S3():a(0) { }
-  S3(S3 &s3):a(s3.a) { }
+  S3() : a(0) {}
+  S3(S3 &s3) : a(s3.a) {}
 };
-const S3 c; // expected-note {{predetermined as shared}}
-const S3 ca[5]; // expected-note {{predetermined as shared}}
-extern const int f; // expected-note {{predetermined as shared}}
-class S4 { // expected-note {{'S4' declared here}}
+const S3 c;         // expected-note {{global variable is predetermined as shared}}
+const S3 ca[5];     // expected-note {{global variable is predetermined as shared}}
+extern const int f; // expected-note {{global variable is predetermined as shared}}
+class S4 {          // expected-note {{'S4' declared here}}
   int a;
   S4();
   S4(const S4 &s4);
+
 public:
-  S4(int v):a(v) { }
+  S4(int v) : a(v) {}
 };
 class S5 { // expected-note {{'S5' declared here}}
   int a;
-  S5():a(0) {}
+  S5() : a(0) {}
+
 public:
-  S5(const S5 &s5):a(s5.a) { }
-  S5(int v):a(v) { }
+  S5(const S5 &s5) : a(s5.a) {}
+  S5(int v) : a(v) {}
 };
 
 S3 h;
 #pragma omp threadprivate(h) // expected-note 2 {{defined as threadprivate or thread local}}
 
-template<class I, class C> int foomain(I argc, C **argv) {
+template <class I, class C>
+int foomain(I argc, C **argv) {
   I e(4);
   I g(5);
   int i;
-  int &j = i; // expected-note {{'j' defined here}}
-  #pragma omp simd lastprivate // expected-error {{expected '(' after 'lastprivate'}}
-  for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp simd lastprivate ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
-  for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp simd lastprivate () // expected-error {{expected expression}}
-  for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp simd lastprivate (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
-  for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp simd lastprivate (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
-  for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp simd lastprivate (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
-  for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp simd lastprivate (argc)
-  for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp simd lastprivate (S1) // expected-error {{'S1' does not refer to a value}}
-  for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp simd lastprivate (a, b) // expected-error {{lastprivate variable with incomplete type 'S1'}}
-  for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp simd lastprivate (argv[1]) // expected-error {{expected variable name}}
-  for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp simd lastprivate(e, g)
-  for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp simd lastprivate(h) // expected-error {{threadprivate or thread local variable cannot be lastprivate}}
-  for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp simd firstprivate(i) // expected-error {{unexpected OpenMP clause 'firstprivate' in directive '#pragma omp simd'}}
-  for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp parallel
+  int &j = i;                // expected-note {{'j' defined here}}
+#pragma omp simd lastprivate // expected-error {{expected '(' after 'lastprivate'}}
+  for (int k = 0; k < argc; ++k)
+    ++k;
+#pragma omp simd lastprivate( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
+  for (int k = 0; k < argc; ++k)
+    ++k;
+#pragma omp simd lastprivate() // expected-error {{expected expression}}
+  for (int k = 0; k < argc; ++k)
+    ++k;
+#pragma omp simd lastprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  for (int k = 0; k < argc; ++k)
+    ++k;
+#pragma omp simd lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
+  for (int k = 0; k < argc; ++k)
+    ++k;
+#pragma omp simd lastprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
+  for (int k = 0; k < argc; ++k)
+    ++k;
+#pragma omp simd lastprivate(argc)
+  for (int k = 0; k < argc; ++k)
+    ++k;
+#pragma omp simd lastprivate(S1) // expected-error {{'S1' does not refer to a value}}
+  for (int k = 0; k < argc; ++k)
+    ++k;
+#pragma omp simd lastprivate(a, b) // expected-error {{lastprivate variable with incomplete type 'S1'}}
+  for (int k = 0; k < argc; ++k)
+    ++k;
+#pragma omp simd lastprivate(argv[1]) // expected-error {{expected variable name}}
+  for (int k = 0; k < argc; ++k)
+    ++k;
+#pragma omp simd lastprivate(e, g)
+  for (int k = 0; k < argc; ++k)
+    ++k;
+#pragma omp simd lastprivate(h) // expected-error {{threadprivate or thread local variable cannot be lastprivate}}
+  for (int k = 0; k < argc; ++k)
+    ++k;
+#pragma omp simd firstprivate(i) // expected-error {{unexpected OpenMP clause 'firstprivate' in directive '#pragma omp simd'}}
+  for (int k = 0; k < argc; ++k)
+    ++k;
+#pragma omp parallel
   {
     int v = 0;
     int i;
-    #pragma omp simd lastprivate(i)
-    for (int k = 0; k < argc; ++k) { i = k; v += i; }
+#pragma omp simd lastprivate(i)
+    for (int k = 0; k < argc; ++k) {
+      i = k;
+      v += i;
+    }
   }
-  #pragma omp parallel shared(i)
-  #pragma omp parallel private(i)
-  #pragma omp simd lastprivate (j) // expected-error {{arguments of OpenMP clause 'lastprivate' cannot be of reference type}}
-  for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp simd lastprivate(i)
-  for (int k = 0; k < argc; ++k) ++k;
+#pragma omp parallel shared(i)
+#pragma omp parallel private(i)
+#pragma omp simd lastprivate(j) // expected-error {{arguments of OpenMP clause 'lastprivate' cannot be of reference type}}
+  for (int k = 0; k < argc; ++k)
+    ++k;
+#pragma omp simd lastprivate(i)
+  for (int k = 0; k < argc; ++k)
+    ++k;
   return 0;
 }
 
 int main(int argc, char **argv) {
-  const int d = 5; // expected-note {{predetermined as shared}}
-  const int da[5] = { 0 }; // expected-note {{predetermined as shared}}
-  S4 e(4); // expected-note {{'e' defined here}}
-  S5 g(5); // expected-note {{'g' defined here}}
-  S3 m; // expected-note {{'m' defined here}}
+  const int d = 5;       // expected-note {{constant variable is predetermined as shared}}
+  const int da[5] = {0}; // expected-note {{constant variable is predetermined as shared}}
+  S4 e(4);               // expected-note {{'e' defined here}}
+  S5 g(5);               // expected-note {{'g' defined here}}
+  S3 m;                  // expected-note {{'m' defined here}}
   int i;
-  int &j = i; // expected-note {{'j' defined here}}
-  #pragma omp simd lastprivate // expected-error {{expected '(' after 'lastprivate'}}
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp simd lastprivate ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp simd lastprivate () // expected-error {{expected expression}}
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp simd lastprivate (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp simd lastprivate (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp simd lastprivate (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp simd lastprivate (argc)
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp simd lastprivate (S1) // expected-error {{'S1' does not refer to a value}}
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp simd lastprivate (a, b, c, d, f) // expected-error {{lastprivate variable with incomplete type 'S1'}} expected-error 3 {{shared variable cannot be lastprivate}}
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp simd lastprivate (argv[1]) // expected-error {{expected variable name}}
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp simd lastprivate (2*2) // expected-error {{expected variable name}}
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp simd lastprivate(ba)
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp simd lastprivate(ca) // expected-error {{shared variable cannot be lastprivate}}
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp simd lastprivate(da) // expected-error {{shared variable cannot be lastprivate}}
-  for (i = 0; i < argc; ++i) foo();
+  int &j = i;                // expected-note {{'j' defined here}}
+#pragma omp simd lastprivate // expected-error {{expected '(' after 'lastprivate'}}
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp simd lastprivate( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp simd lastprivate() // expected-error {{expected expression}}
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp simd lastprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp simd lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp simd lastprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp simd lastprivate(argc)
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp simd lastprivate(S1) // expected-error {{'S1' does not refer to a value}}
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp simd lastprivate(a, b, c, d, f) // expected-error {{lastprivate variable with incomplete type 'S1'}} expected-error 3 {{shared variable cannot be lastprivate}}
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp simd lastprivate(argv[1]) // expected-error {{expected variable name}}
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp simd lastprivate(2 * 2) // expected-error {{expected variable name}}
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp simd lastprivate(ba)
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp simd lastprivate(ca) // expected-error {{shared variable cannot be lastprivate}}
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp simd lastprivate(da) // expected-error {{shared variable cannot be lastprivate}}
+  for (i = 0; i < argc; ++i)
+    foo();
   int xa;
-  #pragma omp simd lastprivate(xa) // OK
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp simd lastprivate(S2::S2s) // expected-error {{shared variable cannot be lastprivate}}
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp simd lastprivate(S2::S2sc) // expected-error {{shared variable cannot be lastprivate}}
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp simd firstprivate (g) // expected-error {{unexpected OpenMP clause 'firstprivate' in directive '#pragma omp simd'}}
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp simd lastprivate(e, g) // expected-error 2 {{lastprivate variable must have an accessible, unambiguous default constructor}}
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp simd lastprivate(m) // expected-error {{lastprivate variable must have an accessible, unambiguous copy assignment operator}}
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp simd lastprivate(h) // expected-error {{threadprivate or thread local variable cannot be lastprivate}}
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp simd private(xa), lastprivate(xa) // expected-error {{private variable cannot be lastprivate}} expected-note {{defined as private}}
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp simd lastprivate(i)
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp parallel private(xa) 
-  #pragma omp simd lastprivate(xa) // OK: may be lastprivate
-  for (i = 0; i < argc; ++i) foo();
-  #pragma omp parallel
-  #pragma omp simd lastprivate(j) // expected-error {{arguments of OpenMP clause 'lastprivate' cannot be of reference type}}
-  for (i = 0; i < argc; ++i) foo();
+#pragma omp simd lastprivate(xa) // OK
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp simd lastprivate(S2::S2s) // expected-error {{shared variable cannot be lastprivate}}
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp simd lastprivate(S2::S2sc) // expected-error {{shared variable cannot be lastprivate}}
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp simd firstprivate(g) // expected-error {{unexpected OpenMP clause 'firstprivate' in directive '#pragma omp simd'}}
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp simd lastprivate(e, g) // expected-error 2 {{lastprivate variable must have an accessible, unambiguous default constructor}}
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp simd lastprivate(m) // expected-error {{lastprivate variable must have an accessible, unambiguous copy assignment operator}}
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp simd lastprivate(h) // expected-error {{threadprivate or thread local variable cannot be lastprivate}}
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp simd private(xa), lastprivate(xa) // expected-error {{private variable cannot be lastprivate}} expected-note {{defined as private}}
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp simd lastprivate(i)
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp parallel private(xa)
+#pragma omp simd lastprivate(xa) // OK: may be lastprivate
+  for (i = 0; i < argc; ++i)
+    foo();
+#pragma omp parallel
+#pragma omp simd lastprivate(j) // expected-error {{arguments of OpenMP clause 'lastprivate' cannot be of reference type}}
+  for (i = 0; i < argc; ++i)
+    foo();
   return 0;
 }