Updated error messages

Author: urvi-rav

clang/include/clang/Basic/DiagnosticParseKinds.td

@@ -1660,8 +1660,6 @@ def err_omp_expected_colon : Error<"missing ':' in %0">;
 def err_omp_missing_comma : Error< "missing ',' after %0">;
 def err_omp_expected_context_selector
     : Error<"expected valid context selector in %0">;
-def err_omp_unknown_clause
-    : Error<"expected an OpenMP clause">;
 def warn_omp_default_deprecated : Warning<"'default' clause for"
   " 'metadirective' is deprecated; use 'otherwise' instead">, InGroup<Deprecated>;
 def err_omp_requires_out_inout_depend_type : Error<

clang/lib/Parse/ParseOpenMP.cpp

@@ -2761,11 +2761,10 @@ StmtResult Parser::ParseOpenMPDeclarativeOrExecutableDirective(
                                    : getOpenMPClauseKind(PP.getSpelling(Tok));
       // Check if the clause is unrecognized.
       if (CKind == OMPC_unknown)
-        Diag(Tok, diag::err_omp_unknown_clause)
-            << PP.getSpelling(Tok) << "metadirective";
+        Diag(Tok, diag::err_omp_expected_clause) << "metadirective";
       if (getLangOpts().OpenMP < 52 && CKind == OMPC_otherwise)
         Diag(Tok, diag::err_omp_unexpected_clause)
-            << PP.getSpelling(Tok) << "metadirective";
+            << getOpenMPClauseName(CKind) << "metadirective";
       if (CKind == OMPC_default && getLangOpts().OpenMP >= 52)
         Diag(Tok, diag::warn_omp_default_deprecated);
 

clang/test/OpenMP/metadirective_messages.cpp

@@ -24,7 +24,7 @@ void foo() {
       ;
     #pragma omp metadirective when(device = {arch(nvptx)} : parallel) default() // omp52-warning {{'default' clause for 'metadirective' is deprecated; use 'otherwise' instead}}
       ;
-    #pragma omp metadirective when(device = {arch(nvptx)} : parallel) xyz() //omp52-error {{expected an OpenMP clause}} 
+    #pragma omp metadirective when(device = {arch(nvptx)} : parallel) xyz() //omp52-error {{expected at least one clause on '#pragma omp metadirective' directive}} 
       ;
   #else
     #pragma omp metadirective // expected-error {{expected expression}}
@@ -45,7 +45,7 @@ void foo() {
       ;
     #pragma omp metadirective when(device = {isa("some-unsupported-feature")} : parallel) otherwise(single) // expected-warning {{isa trait 'some-unsupported-feature' is not known to the current target; verify the spelling or consider restricting the context selector with the 'arch' selector further}} //expected-error{{unexpected OpenMP clause 'otherwise' in directive '#pragma omp metadirective'}}
       ;
-    #pragma omp metadirective when(device = {arch(nvptx)} : parallel) xyz() //expected-error {{expected an OpenMP clause}} 
+    #pragma omp metadirective when(device = {arch(nvptx)} : parallel) xyz() //expected-error {{expected at least one clause on '#pragma omp metadirective' directive}} 
       ;
   #endif
   }