Revert "Merge pull request #27528 from rintaro/syntaxparse-rdar55952739"

This reverts commit 2ddba9c, reversing
changes made to 33770fa.

Author: rintaro

include/swift/Parse/ASTGen.h

@@ -67,8 +67,10 @@ class ASTGen {
 
 private:
   DeclAttributes
-  generateDeclAttributes(const syntax::Syntax &D, SourceLoc Loc,
-                         bool includeComments);
+  generateDeclAttributes(const syntax::DeclSyntax &D,
+                         const Optional<syntax::AttributeListSyntax> &attrs,
+                         const Optional<syntax::ModifierListSyntax> &modifiers,
+                         SourceLoc Loc, bool includeComments);
 
   void generateFreeStandingGenericWhereClause(
                                 const syntax::GenericWhereClauseSyntax &syntax,

lib/Parse/ASTGen.cpp

@@ -57,14 +57,21 @@ Decl *ASTGen::generate(const DeclSyntax &D, const SourceLoc Loc) {
 }
 
 DeclAttributes
-ASTGen::generateDeclAttributes(const Syntax &D, SourceLoc Loc,
-                               bool includeComments) {
-  // Find the AST attribute-list from the lookup table.
-  if (auto firstTok = D.getFirstToken()) {
-    auto declLoc = advanceLocBegin(Loc, *firstTok);
-    if (hasDeclAttributes(declLoc))
-      return getDeclAttributes(declLoc);
+ASTGen::generateDeclAttributes(const DeclSyntax &D,
+                               const Optional<AttributeListSyntax> &attrs,
+                               const Optional<ModifierListSyntax> &modifiers,
+                               SourceLoc Loc, bool includeComments) {
+  SourceLoc attrsLoc;
+  if (attrs) {
+    attrsLoc = advanceLocBegin(Loc, *attrs->getFirstToken());
+  } else if (modifiers) {
+    attrsLoc = advanceLocBegin(Loc, *modifiers->getFirstToken());
+  } else {
+    // We might have comment attributes.
+    attrsLoc = advanceLocBegin(Loc, *D.getFirstToken());
   }
+  if (hasDeclAttributes(attrsLoc))
+    return getDeclAttributes(attrsLoc);
   return DeclAttributes();
 }
 
@@ -104,7 +111,8 @@ TypeDecl *ASTGen::generate(const AssociatedtypeDeclSyntax &D,
   Identifier name;
   SourceLoc nameLoc = generateIdentifierDeclName(idToken, Loc, name);
 
-  DeclAttributes attrs = generateDeclAttributes(D, Loc, true);
+  DeclAttributes attrs =
+      generateDeclAttributes(D, D.getAttributes(), D.getModifiers(), Loc, true);
 
   DebuggerContextChange DCC(P, name, DeclKind::AssociatedType);
 
@@ -139,7 +147,8 @@ TypeDecl *ASTGen::generate(const TypealiasDeclSyntax &D, const SourceLoc Loc) {
   auto keywordLoc = advanceLocBegin(Loc, D.getTypealiasKeyword());
   Identifier name;
   SourceLoc nameLoc = generateIdentifierDeclName(idToken, Loc, name);
-  auto attrs = generateDeclAttributes(D, Loc, true);
+  auto attrs =
+      generateDeclAttributes(D, D.getAttributes(), D.getModifiers(), Loc, true);
   SourceLoc equalLoc;
 
   DebuggerContextChange DCC(P, name, DeclKind::TypeAlias);
@@ -1130,7 +1139,14 @@ GenericParamList *ASTGen::generate(const GenericParameterClauseSyntax &clause,
 
   for (auto elem : clause.getGenericParameterList()) {
 
-    DeclAttributes attrs = generateDeclAttributes(elem, Loc, false);
+    DeclAttributes attrs;
+    if (auto attrsSyntax = elem.getAttributes()) {
+      if (auto firstTok = attrsSyntax->getFirstToken()) {
+        auto attrsLoc = advanceLocBegin(Loc, *firstTok);
+        if (hasDeclAttributes(attrsLoc))
+          attrs = getDeclAttributes(attrsLoc);
+      }
+    }
     Identifier name = Context.getIdentifier(elem.getName().getIdentifierText());
     SourceLoc nameLoc = advanceLocBegin(Loc, elem.getName());
 

lib/Parse/ParseDecl.cpp

@@ -2714,7 +2714,6 @@ Parser::parseDecl(ParseDeclOptions Flags,
                                   StructureMarkerKind::Declaration);
 
   // Parse attributes.
-  SourceLoc AttrsLoc = Tok.getLoc();
   DeclAttributes Attributes;
   if (Tok.hasComment())
     Attributes.add(new (Context) RawDocCommentAttr(Tok.getCommentRange()));
@@ -2726,8 +2725,12 @@ Parser::parseDecl(ParseDeclOptions Flags,
   StaticSpellingKind StaticSpelling = StaticSpellingKind::None;
   parseDeclModifierList(Attributes, StaticLoc, StaticSpelling);
 
-  if (!Attributes.isEmpty())
-    Generator.addDeclAttributes(Attributes, AttrsLoc);
+  if (!Attributes.isEmpty()) {
+    auto startLoc = Attributes.getStartLoc();
+    if (startLoc.isInvalid())
+      startLoc = Tok.getLoc();
+    Generator.addDeclAttributes(Attributes, startLoc);
+  }
 
   // We emit diagnostics for 'try let ...' in parseDeclVar().
   SourceLoc tryLoc;

lib/Parse/ParseGeneric.cpp

@@ -78,11 +78,10 @@ Parser::parseGenericParameterClauseSyntax() {
       SyntaxParsingContext TmpCtxt(SyntaxContext);
       TmpCtxt.setTransparent();
 
-      auto AttrsLoc = Tok.getLoc();
       DeclAttributes attrsAST;
       parseDeclAttributeList(attrsAST);
       if (!attrsAST.isEmpty())
-        Generator.addDeclAttributes(attrsAST, AttrsLoc);
+        Generator.addDeclAttributes(attrsAST, attrsAST.getStartLoc());
       auto attrs = SyntaxContext->popIf<ParsedAttributeListSyntax>();
       if (attrs)
         paramBuilder.useAttributes(std::move(*attrs));