diff --git a/clang/include/clang/Parse/Parser.h b/clang/include/clang/Parse/Parser.h index 4631e9a4679c4..2f56da8439d07 100644 --- a/clang/include/clang/Parse/Parser.h +++ b/clang/include/clang/Parse/Parser.h @@ -3531,7 +3531,7 @@ class Parser : public CodeCompletionHandler { /// Placeholder for now, should just ignore the directives after emitting a /// diagnostic. Eventually will be split into a few functions to parse /// different situations. - DeclGroupPtrTy ParseOpenACCDirective(); + DeclGroupPtrTy ParseOpenACCDirectiveDecl(); StmtResult ParseOpenACCDirectiveStmt(); private: diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp index d86f477b4c9ff..8cb5b09fd3b0f 100644 --- a/clang/lib/Parse/ParseDecl.cpp +++ b/clang/lib/Parse/ParseDecl.cpp @@ -4735,7 +4735,7 @@ void Parser::ParseStructUnionBody(SourceLocation RecordLoc, } if (Tok.is(tok::annot_pragma_openacc)) { - ParseOpenACCDirective(); + ParseOpenACCDirectiveDecl(); continue; } diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp index e12215d74bcc8..d9125955fda27 100644 --- a/clang/lib/Parse/ParseDeclCXX.cpp +++ b/clang/lib/Parse/ParseDeclCXX.cpp @@ -3430,7 +3430,7 @@ Parser::DeclGroupPtrTy Parser::ParseCXXClassMemberDeclarationWithPragmas( return ParseOpenMPDeclarativeDirectiveWithExtDecl( AS, AccessAttrs, /*Delayed=*/true, TagType, TagDecl); case tok::annot_pragma_openacc: - return ParseOpenACCDirective(); + return ParseOpenACCDirectiveDecl(); default: if (tok::isPragmaAnnotation(Tok.getKind())) { diff --git a/clang/lib/Parse/ParseOpenACC.cpp b/clang/lib/Parse/ParseOpenACC.cpp index 2fba6cd2805cf..ab790515caa7e 100644 --- a/clang/lib/Parse/ParseOpenACC.cpp +++ b/clang/lib/Parse/ParseOpenACC.cpp @@ -15,7 +15,7 @@ using namespace clang; -Parser::DeclGroupPtrTy Parser::ParseOpenACCDirective() { +Parser::DeclGroupPtrTy Parser::ParseOpenACCDirectiveDecl() { Diag(Tok, diag::warn_pragma_acc_unimplemented); SkipUntil(tok::annot_pragma_openacc_end); return nullptr; diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp index 41b74624bf1b7..9eed088208871 100644 --- a/clang/lib/Parse/Parser.cpp +++ b/clang/lib/Parse/Parser.cpp @@ -858,7 +858,7 @@ Parser::ParseExternalDeclaration(ParsedAttributes &Attrs, return ParseOpenMPDeclarativeDirectiveWithExtDecl(AS, Attrs); } case tok::annot_pragma_openacc: - return ParseOpenACCDirective(); + return ParseOpenACCDirectiveDecl(); case tok::annot_pragma_ms_pointers_to_members: HandlePragmaMSPointersToMembers(); return nullptr;