Merge pull request #36491 from ahoppen/pr/rdar64304839

[SourceKit] Fix crash in syntax model

Author: ahoppen

lib/Parse/ParseDecl.cpp

@@ -2329,7 +2329,13 @@ bool Parser::parseNewDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc,
       if (Status.isErrorOrHasCompletion())
         return false;
 
-      AttrRange = SourceRange(Loc, Tok.getLoc());
+      if (!consumeIf(tok::r_paren)) {
+        diagnose(Tok.getLoc(), diag::attr_expected_rparen, AttrName,
+                 DeclAttribute::isDeclModifier(DK));
+        return false;
+      }
+
+      AttrRange = SourceRange(Loc, PreviousLoc);
       // For each platform version spec in the spec list, create an
       // implicit AvailableAttr for the platform with the introduced
       // version from the spec. For example, if we have
@@ -2393,12 +2399,6 @@ bool Parser::parseNewDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc,
                                      /*Implicit=*/false));
       }
 
-      if (!consumeIf(tok::r_paren)) {
-        diagnose(Tok.getLoc(), diag::attr_expected_rparen, AttrName,
-                 DeclAttribute::isDeclModifier(DK));
-        return false;
-      }
-
       break;
     }
 

test/SourceKit/Misc/rdar64304839.swift

@@ -0,0 +1,6 @@
+// RUN: %sourcekitd-test -req=open %s -- %s
+// Test that this doesn't crash sourcekitd
+
+@available(macOS 10.12
+@available(macOS 10.13
+func foo() {} {code}