diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp index 746f996d368eb9743b60a43cd404112028ce6d23..be694901b912249af0fecd8f1edb2e67f3d8fd25 100644 --- a/lib/Parse/ParseDecl.cpp +++ b/lib/Parse/ParseDecl.cpp @@ -3453,6 +3453,22 @@ void Parser::ParseDeclarationSpecifiers(DeclSpec &DS, ParseDecltypeSpecifier(DS); continue; + case tok::annot_pragma_pack: + HandlePragmaPack(); + continue; + + case tok::annot_pragma_ms_pragma: + HandlePragmaMSPragma(); + continue; + + case tok::annot_pragma_ms_vtordisp: + HandlePragmaMSVtorDisp(); + continue; + + case tok::annot_pragma_ms_pointers_to_members: + HandlePragmaMSPointersToMembers(); + continue; + case tok::kw___underlying_type: ParseUnderlyingTypeSpecifier(DS); continue; diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp index b80f9ee1b02a7eba7e93f2ffc77b4bf7c09c732e..d55b2d9442c6d553a4830f0e86acd31096eeaa83 100644 --- a/lib/Parse/ParseDeclCXX.cpp +++ b/lib/Parse/ParseDeclCXX.cpp @@ -1100,6 +1100,13 @@ bool Parser::isValidAfterTypeSpecifier(bool CouldBeBitfield) { // FIXME: we should emit semantic diagnostic when declaration // attribute is in type attribute position. case tok::kw___attribute: // struct foo __attribute__((used)) x; + case tok::annot_pragma_pack: // struct foo {...} _Pragma(pack(pop)); + // struct foo {...} _Pragma(section(...)); + case tok::annot_pragma_ms_pragma: + // struct foo {...} _Pragma(vtordisp(pop)); + case tok::annot_pragma_ms_vtordisp: + // struct foo {...} _Pragma(pointers_to_members(...)); + case tok::annot_pragma_ms_pointers_to_members: return true; case tok::colon: return CouldBeBitfield; // enum E { ... } : 2; diff --git a/test/Parser/pragma-pack.c b/test/Parser/pragma-pack.c index 172a332510a7ec4879d2eca5727e1985c3741f8c..0859f4157ce3b45c7d2edc867eb9dde4b85fade6 100644 --- a/test/Parser/pragma-pack.c +++ b/test/Parser/pragma-pack.c @@ -44,3 +44,7 @@ struct S #pragma pack() int e; }; + +_Pragma("pack(push, 1)") struct PR28094 { + int a; +} _Pragma("pack(pop)");