diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp
index 0fa21e89b1236..06b87a4208702 100644
--- a/clang/lib/Sema/SemaOpenMP.cpp
+++ b/clang/lib/Sema/SemaOpenMP.cpp
@@ -3286,7 +3286,7 @@ SemaOpenMP::ActOnOpenMPGroupPrivateDirective(SourceLocation Loc,
                                              ArrayRef<Expr *> VarList) {
   if (!getLangOpts().OpenMP || getLangOpts().OpenMP < 60) {
     Diag(Loc, diag::err_omp_unexpected_directive)
-        << getOpenMPDirectiveName(OMPD_groupprivate, getLangOpts().OpenMP);
+        << 1 << getOpenMPDirectiveName(OMPD_groupprivate, getLangOpts().OpenMP);
     return nullptr;
   }
   if (OMPGroupPrivateDecl *D = CheckOMPGroupPrivateDecl(Loc, VarList)) {
diff --git a/clang/test/OpenMP/groupprivate_messages.cpp b/clang/test/OpenMP/groupprivate_messages.cpp
index aefa290795c41..4f24cfd861ac2 100644
--- a/clang/test/OpenMP/groupprivate_messages.cpp
+++ b/clang/test/OpenMP/groupprivate_messages.cpp
@@ -8,6 +8,7 @@
 #pragma omp groupprivate( // expected-error {{expected identifier}} expected-error {{expected ')'}} expected-note {{to match this '('}}
 #pragma omp groupprivate() // expected-error {{expected identifier}}
 #pragma omp groupprivate(1) // expected-error {{expected unqualified-id}}
+#pragma omp groupprivate(a) // expected-error {{use of undeclared identifier 'a'}}
 struct CompleteSt{
  int a;
 };