[libSyntax] Fix parsing of member declarations with trailing semicolon

Author: ahoppen

lib/Parse/ParseDecl.cpp

@@ -2454,7 +2454,8 @@ Parser::parseDecl(ParseDeclOptions Flags,
 
         ParserStatus Status;
         bool PreviousHadSemi = true;
-        SyntaxParsingContext DeclListCtx(SyntaxContext, SyntaxKind::DeclList);
+        SyntaxParsingContext DeclListCtx(SyntaxContext,
+                                         SyntaxKind::MemberDeclList);
         while (Tok.isNot(tok::pound_else, tok::pound_endif, tok::pound_elseif,
                          tok::eof)) {
           if (Tok.is(tok::r_brace)) {
@@ -3103,7 +3104,6 @@ void Parser::diagnoseConsecutiveIDs(StringRef First, SourceLoc FirstLoc,
 ParserStatus Parser::parseDeclItem(bool &PreviousHadSemi,
                                    Parser::ParseDeclOptions Options,
                                    llvm::function_ref<void(Decl*)> handler) {
-  SyntaxParsingContext DeclContext(SyntaxContext, SyntaxContextKind::Decl);
   if (Tok.is(tok::semi)) {
     // Consume ';' without preceding decl.
     diagnose(Tok, diag::unexpected_separator, ";")
@@ -3128,9 +3128,15 @@ ParserStatus Parser::parseDeclItem(bool &PreviousHadSemi,
     return LineDirectiveStatus;
   }
 
-  auto Result = parseDecl(Options, handler);
-  if (Result.isParseError())
-    skipUntilDeclRBrace(tok::semi, tok::pound_endif);
+  ParserResult<Decl> Result;
+  SyntaxParsingContext DeclContext(SyntaxContext,
+                                   SyntaxKind::MemberDeclListItem);
+  {
+    SyntaxParsingContext DeclContext(SyntaxContext, SyntaxContextKind::Decl);
+    Result = parseDecl(Options, handler);
+    if (Result.isParseError())
+      skipUntilDeclRBrace(tok::semi, tok::pound_endif);
+  }
   SourceLoc SemiLoc;
   PreviousHadSemi = consumeIf(tok::semi, SemiLoc);
   if (PreviousHadSemi && Result.isNonNull())
@@ -3149,7 +3155,7 @@ bool Parser::parseDeclList(SourceLoc LBLoc, SourceLoc &RBLoc,
   ParserStatus Status;
   bool PreviousHadSemi = true;
   {
-    SyntaxParsingContext ListContext(SyntaxContext, SyntaxKind::DeclList);
+    SyntaxParsingContext ListContext(SyntaxContext, SyntaxKind::MemberDeclList);
     while (Tok.isNot(tok::r_brace)) {
       Status |= parseDeclItem(PreviousHadSemi, Options, handler);
       if (Tok.isAny(tok::eof, tok::pound_endif, tok::pound_else,

test/Syntax/Inputs/serialize_multiple_decls.json

@@ -71,7 +71,7 @@
                       "presence": "Present"
                     },
                     {
-                      "kind": "DeclList",
+                      "kind": "MemberDeclList",
                       "layout": [],
                       "presence": "Present"
                     },
@@ -153,7 +153,7 @@
                       "presence": "Present"
                     },
                     {
-                      "kind": "DeclList",
+                      "kind": "MemberDeclList",
                       "layout": [],
                       "presence": "Present"
                     },