Merge pull request #6030 from hughbe/printobjc-msvc

Author: swift-ci

lib/PrintAsObjC/PrintAsObjC.cpp

@@ -159,7 +159,7 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
 
   void print(const Decl *D) {
     PrettyStackTraceDecl trace("printing", D);
-    visit(const_cast<Decl *>(D));
+    ASTVisitor::visit(const_cast<Decl *>(D));
   }
 
   void printAdHocCategory(iterator_range<const ValueDecl * const *> members) {
@@ -194,8 +194,6 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
   }
 
 private:
-  using ASTVisitor::visit;
-
   /// Prints a protocol adoption list: <code>&lt;NSCoding, NSCopying&gt;</code>
   ///
   /// This method filters out non-ObjC protocols, along with the special
@@ -241,7 +239,7 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
         protocolMembersOptional = VD->getAttrs().hasAttribute<OptionalAttr>();
         os << (protocolMembersOptional ? "@optional\n" : "@required\n");
       }
-      visit(const_cast<ValueDecl*>(VD));
+      ASTVisitor::visit(const_cast<ValueDecl*>(VD));
     }
   }
 
@@ -821,7 +819,7 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
       break;
     case NullabilityPrintKind::After:
       os << ' ';
-      [[clang::fallthrough]];
+      LLVM_FALLTHROUGH;
     case NullabilityPrintKind::Before:
       switch (*kind) {
       case OTK_None:
@@ -1536,7 +1534,7 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
   }
 };
 
-class ReferencedTypeFinder : private TypeVisitor<ReferencedTypeFinder> {
+class ReferencedTypeFinder : public TypeVisitor<ReferencedTypeFinder> {
   friend TypeVisitor;
 
   ModuleDecl &M;
@@ -1782,6 +1780,8 @@ class ModuleWriter {
     case EmissionState::Defined:
       return true;
     }
+
+    llvm_unreachable("Unhandled EmissionState in switch.");
   }
 
   void forwardDeclare(const NominalTypeDecl *NTD,