1 files changed, 27 insertions, 9 deletions
diff --git a/test/OpenMP/task_messages.cpp b/test/OpenMP/task_messages.cpp
index 832d8fa57d677..d490c7f8ea489 100644
--- a/test/OpenMP/task_messages.cpp
+++ b/test/OpenMP/task_messages.cpp
@@ -8,7 +8,7 @@ void foo() {
 #pragma omp task // expected-error {{unexpected OpenMP directive '#pragma omp task'}}
 
 class S {
-  S(const S &s) { a = s.a + 12; } // expected-note 10 {{implicitly declared private here}}
+  S(const S &s) { a = s.a + 12; } // expected-note 16 {{implicitly declared private here}}
   int a;
 
 public:
@@ -40,21 +40,30 @@ int foo() {
   ++s1;
 #pragma omp task default(none)
 #pragma omp task default(shared)
-  ++a;
+  ++a; // expected-error 2 {{variable 'a' must have explicitly specified data sharing attributes}}
 #pragma omp task default(none)
 #pragma omp task
   // expected-error@+1 {{calling a private constructor of class 'S'}}
-  ++a;
+  ++a; // expected-error 2 {{variable 'a' must have explicitly specified data sharing attributes}}
+#pragma omp task
 #pragma omp task
+  // expected-error@+1 {{calling a private constructor of class 'S'}}
+  ++a; // expected-error {{calling a private constructor of class 'S'}}
+#pragma omp task default(shared)
 #pragma omp task
   // expected-error@+1 {{calling a private constructor of class 'S'}}
   ++a;
+#pragma omp parallel shared(a)
+#pragma omp task
+#pragma omp task
+  ++a;
+#pragma omp parallel shared(a)
 #pragma omp task default(shared)
 #pragma omp task
   ++a;
 #pragma omp task
 #pragma omp parallel
-  ++a;
+  ++a; // expected-error {{calling a private constructor of class 'S'}}
 // expected-error@+2 {{calling a private constructor of class 'S'}}
 #pragma omp task
   ++b;
@@ -177,10 +186,10 @@ L2:
 
 #pragma omp task default(none)
 #pragma omp task default(shared)
-  ++a;
+  ++a; // expected-error {{variable 'a' must have explicitly specified data sharing attributes}}
 #pragma omp task default(none)
 #pragma omp task
-  ++a;
+  ++a; // expected-error {{variable 'a' must have explicitly specified data sharing attributes}}
 #pragma omp task default(shared)
 #pragma omp task
   ++a;
@@ -194,21 +203,30 @@ L2:
   ++a, ++b;
 #pragma omp task default(none)
 #pragma omp task default(shared)
-  ++sa;
+  ++sa; // expected-error {{variable 'sa' must have explicitly specified data sharing attributes}}
 #pragma omp task default(none)
 #pragma omp task
   // expected-error@+1 {{calling a private constructor of class 'S'}}
-  ++sa;
+  ++sa; // expected-error {{variable 'sa' must have explicitly specified data sharing attributes}}
 #pragma omp task
 #pragma omp task
   // expected-error@+1 {{calling a private constructor of class 'S'}}
+  ++sa; // expected-error {{calling a private constructor of class 'S'}}
+#pragma omp task default(shared)
+#pragma omp task
+  // expected-error@+1 {{calling a private constructor of class 'S'}}
   ++sa;
+#pragma omp parallel shared(sa)
+#pragma omp task
+#pragma omp task
+  ++sa;
+#pragma omp parallel shared(sa)
 #pragma omp task default(shared)
 #pragma omp task
   ++sa;
 #pragma omp task
 #pragma omp parallel
-  ++sa;
+  ++sa; // expected-error {{calling a private constructor of class 'S'}}
 // expected-error@+2 {{calling a private constructor of class 'S'}}
 #pragma omp task
   ++sb;