Skip task outline pragmas if we're in C mode and class context. Fix a buggy diagnostic too.

Fixes llvm#152

Author: mikaoP

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -11426,7 +11426,7 @@ def warn_oss_section_is_char : Warning<"array section %select{lower bound|length
 def err_oss_single_decl_in_task : Error<
   "single declaration is expected after 'task' directive">;
 def err_oss_function_expected : Error<
-  "'#pragma oss task' can only be applied to %select{functions|non-volatile or static methods}0">;
+  "'#pragma oss task' can only be applied to functions">;
 def err_oss_non_void_task : Error<
   "non-void tasks are not supported">;
 def err_oss_rvalue_param_task : Error<

clang/lib/Parse/ParseOmpSs.cpp

@@ -461,6 +461,9 @@ Parser::DeclGroupPtrTy Parser::ParseOmpSsDeclarativeDirectiveWithExtDecl(
 
   switch (DKind) {
   case OSSD_task: {
+    // Only allowed in C++ mode
+    if (!getLangOpts().CPlusPlus && getCurScope()->isClassScope())
+      break;
     // The syntax is:
     // { #pragma oss task }
     // <function-declaration-or-definition>

clang/test/OmpSs/Sema/task_function.c

@@ -20,4 +20,17 @@ void foo7(int *p) {}
 #pragma oss task reduction(+: *p) weakreduction(+: *p) // expected-error {{unexpected OmpSs-2 clause 'reduction' in directive '#pragma oss task'}} expected-error {{unexpected OmpSs-2 clause 'weakreduction' in directive '#pragma oss task'}}
 void foo8(int *p) {}
 
+struct S0 {
+  // expected-error@+2 {{field 'foo' declared as a function}}
+  #pragma oss task
+  void foo();
+};
+
+struct S1 {
+  // expected-error@+3 {{field 'bar' declared as a function}}
+  // expected-error@+2 {{expected ';' at end of declaration list}}
+  #pragma oss task
+  void bar() {}
+};
+
 #pragma oss task // expected-error {{function declaration is expected after 'task' function directive}}

clang/test/OmpSs/Sema/task_function1.cpp

@@ -1,23 +1,23 @@
 // RUN: %clang_cc1 -verify -x c++ -fompss-2 -ferror-limit 100 -o - %s
 
 struct S {
-    // expected-error@+2 {{'#pragma oss task' can only be applied to non-volatile or static methods}}
+    // expected-error@+2 {{'#pragma oss task' can only be applied to functions}}
     #pragma oss task in(*p)
     virtual void foo(int *p) {}
 };
 
 struct P : S {
     P() {};
-    // expected-error@+2 {{'#pragma oss task' can only be applied to non-volatile or static methods}}
+    // expected-error@+2 {{'#pragma oss task' can only be applied to functions}}
     #pragma oss task in(*p)
     P(int *p) {}
-    // expected-error@+2 {{'#pragma oss task' can only be applied to non-volatile or static methods}}
+    // expected-error@+2 {{'#pragma oss task' can only be applied to functions}}
     #pragma oss task
     ~P() {}
-    // expected-error@+2 {{'#pragma oss task' can only be applied to non-volatile or static methods}}
+    // expected-error@+2 {{'#pragma oss task' can only be applied to functions}}
     #pragma oss task
     P& operator=(const P &) {}
-    // expected-error@+2 {{'#pragma oss task' can only be applied to non-volatile or static methods}}
+    // expected-error@+2 {{'#pragma oss task' can only be applied to functions}}
     #pragma oss task in(*p)
     void foo(int *p) {}
     #pragma oss task