Merge pull request #5104 from rintaro/static-toplevel

Author: swift-ci

lib/Parse/ParseDecl.cpp

@@ -4001,6 +4001,7 @@ ParserStatus Parser::parseDeclVar(ParseDeclOptions Flags,
       diagnose(Tok, diag::static_var_decl_global_scope, StaticSpelling)
           .fixItRemove(StaticLoc);
       StaticLoc = SourceLoc();
+      StaticSpelling = StaticSpellingKind::None;
     } else if (Flags.contains(PD_InStruct) || Flags.contains(PD_InEnum) ||
                Flags.contains(PD_InProtocol)) {
       if (StaticSpelling == StaticSpellingKind::KeywordClass)
@@ -4375,6 +4376,7 @@ Parser::parseDeclFunc(SourceLoc StaticLoc, StaticSpellingKind StaticSpelling,
       diagnose(Tok, diag::static_func_decl_global_scope, StaticSpelling)
           .fixItRemove(StaticLoc);
       StaticLoc = SourceLoc();
+      StaticSpelling = StaticSpellingKind::None;
     } else if (Flags.contains(PD_InStruct) || Flags.contains(PD_InEnum) ||
                Flags.contains(PD_InProtocol)) {
       if (StaticSpelling == StaticSpellingKind::KeywordClass) {

test/IDE/print_ast_tc_decls_errors.swift

@@ -218,3 +218,10 @@ class OuterContext {
 // CHECK:   func protocolFunc()
   }
 }
+
+static func topLevelStaticFunc() {} // expected-error {{static methods may only be declared on a type}}
+// NO-TYPEPR: {{^}}func topLevelStaticFunc() -> <<error type>>{{$}}
+// TYPEPR: {{^}}func topLevelStaticFunc() {{$}}
+
+static var topLevelStaticVar = 42 // expected-error {{static properties may only be declared on a type}}
+// CHECK: {{^}}var topLevelStaticVar: Int{{$}}