Merge pull request swiftlang#10516 from slavapestov/code-review-is-good

Two really tiny fixes from code review feedback

Author: slavapestov

lib/AST/ASTPrinter.cpp

@@ -2318,15 +2318,19 @@ void PrintAST::visitPatternBindingDecl(PatternBindingDecl *decl) {
 
   if (anyVar)
     printDocumentationComment(anyVar);
-  if (decl->isStatic())
-    printStaticKeyword(decl->getCorrectStaticSpelling());
 
   // FIXME: PatternBindingDecls don't have attributes themselves, so just assume
   // the variables all have the same attributes. This isn't exactly true
   // after type-checking, but it's close enough for now.
   if (anyVar) {
     printAttributes(anyVar);
     printAccessibility(anyVar);
+  }
+
+  if (decl->isStatic())
+    printStaticKeyword(decl->getCorrectStaticSpelling());
+
+  if (anyVar) {
     Printer << (anyVar->isSettable(anyVar->getDeclContext()) ? "var " : "let ");
   } else {
     Printer << "let ";

lib/Sema/TypeCheckDecl.cpp

@@ -2560,8 +2560,8 @@ static void inferDynamic(ASTContext &ctx, ValueDecl *D) {
   if (auto VD = dyn_cast<VarDecl>(D)) {
     auto staticSpelling = VD->getParentPatternBinding()->getStaticSpelling();
 
-    // The presence of 'static' bocks the inference of 'dynamic'.
-    if (VD->isStatic() && staticSpelling == StaticSpellingKind::KeywordStatic)
+    // The presence of 'static' blocks the inference of 'dynamic'.
+    if (staticSpelling == StaticSpellingKind::KeywordStatic)
       return;
 
     if (VD->isLet() && !isNSManaged)
@@ -2577,7 +2577,7 @@ static void inferDynamic(ASTContext &ctx, ValueDecl *D) {
     auto staticSpelling = FD->getStaticSpelling();
 
     // The presence of 'static' bocks the inference of 'dynamic'.
-    if (FD->isStatic() && staticSpelling == StaticSpellingKind::KeywordStatic)
+    if (staticSpelling == StaticSpellingKind::KeywordStatic)
       return;
   }
 

test/attr/attr_dynamic_infer.swift

@@ -78,7 +78,7 @@ extension FinalTests {
     set { }
   }
 
-  // CHECK: static @objc var x
+  // CHECK: @objc static var x
   static var x: Int = 0
 
   // CHECK: @objc static func bar