Merge pull request #6648 from practicalswift/fix-warnings

[gardening] Match param names. Add override. Add end-of-namespace comments.

Author: practicalswift

lib/IRGen/AllocStackHoisting.cpp

@@ -85,7 +85,7 @@ class Partition {
   /// non-overlapping.
   void assignStackLocation(SmallVectorImpl<SILInstruction *> &FunctionExits);
 };
-} // end anonymous namespace.
+} // end anonymous namespace
 
 /// Erases all dealloc_stack users of an alloc_stack
 static void eraseDeallocStacks(AllocStackInst *AllocStack) {
@@ -213,7 +213,7 @@ class Liveness {
     return false;
   }
 };
-} // end anonymous namespace.
+} // end anonymous namespace
 
 namespace {
 /// Merge alloc_stack instructions.
@@ -237,7 +237,7 @@ class MergeStackSlots {
   /// block.
   void mergeSlots();
 };
-} // end anonymous namespace.
+} // end anonymous namespace
 
 MergeStackSlots::MergeStackSlots(SmallVectorImpl<AllocStackInst *> &AllocStacks,
                                  SmallVectorImpl<SILInstruction *> &FuncExits)
@@ -339,7 +339,7 @@ class HoistAllocStack {
   /// Move the hoistable alloc_stack instructions to the entry block.
   void hoist();
 };
-}
+} // end anonymous namespace
 
 /// Collect generic alloc_stack instructions in the current function can be
 /// hoisted.

lib/SILGen/SILGenPoly.cpp

@@ -1086,7 +1086,7 @@ namespace {
         SGF.B.createInitExistentialAddr(Loc, existentialBuf,
                                         inputTupleType,
                                         concreteTL.getLoweredType(),
-                                        /*conformances=*/{});
+                                        /*Conformances=*/{});
 
       auto tupleTemp = SGF.useBufferAsTemporary(tupleBuf, concreteTL);
       translateAndImplodeInto(inputOrigType, inputTupleType,
@@ -1859,7 +1859,7 @@ ResultPlanner::planTupleIntoIndirectResult(AbstractionPattern innerOrigType,
     SILValue outerConcreteResultAddr
       = Gen.B.createInitExistentialAddr(Loc, outerResultAddr, innerSubstType,
                                         Gen.getLoweredType(opaque, innerSubstType),
-                                        /*conformances=*/{});
+                                        /*Conformances=*/{});
 
     // Emit into that address.
     planTupleIntoIndirectResult(innerOrigType, innerSubstType,

lib/Sema/InstrumenterSupport.cpp

@@ -67,7 +67,7 @@ class ErrorFinder : public ASTWalker {
   }
   bool hadError() { return error; }
 };
-}
+} // end anonymous namespace
 
 void InstrumenterBase::anchor() {}
 

lib/Sema/PCMacro.cpp

@@ -327,7 +327,7 @@ class Instrumenter : InstrumenterBase {
     return D;
   }
 
-  BraceStmt *transformBraceStmt(BraceStmt *BS, bool TopLevel = false) {
+  BraceStmt *transformBraceStmt(BraceStmt *BS, bool TopLevel = false) override {
     ArrayRef<ASTNode> OriginalElements = BS->getElements();
     SmallVector<swift::ASTNode, 3> Elements(OriginalElements.begin(),
                                             OriginalElements.end());
@@ -676,7 +676,7 @@ void swift::performPCMacro(SourceFile &SF, TopLevelContext &TLC) {
   public:
     ExpressionFinder(TopLevelContext &TLC) : TLC(TLC) {}
 
-    virtual bool walkToDeclPre(Decl *D) {
+    bool walkToDeclPre(Decl *D) override {
       if (AbstractFunctionDecl *FD = dyn_cast<AbstractFunctionDecl>(D)) {
         if (!FD->isImplicit()) {
           if (FD->getBody()) {

lib/Sema/PlaygroundTransform.cpp

@@ -361,7 +361,7 @@ class Instrumenter : InstrumenterBase {
     }
   }
 
-  BraceStmt *transformBraceStmt(BraceStmt *BS, bool TopLevel = false) {
+  BraceStmt *transformBraceStmt(BraceStmt *BS, bool TopLevel = false) override {
     ArrayRef<ASTNode> OriginalElements = BS->getElements();
     typedef SmallVector<swift::ASTNode, 3> ElementVector;
     ElementVector Elements(OriginalElements.begin(), OriginalElements.end());

lib/Sema/TypeCheckNameLookup.cpp

@@ -222,7 +222,7 @@ TypeChecker::lookupUnqualifiedType(DeclContext *dc, DeclName name,
       options.contains(NameLookupFlags::KnownPrivate),
       loc,
       /*OnlyTypes=*/true,
-      /*ProtocolMembers=*/false,
+      /*AllowProtocolMembers=*/false,
       options.contains(NameLookupFlags::IgnoreAccessibility));
   for (auto found : lookup.Results)
     decls.push_back(cast<TypeDecl>(found.getValueDecl()));
@@ -239,7 +239,7 @@ TypeChecker::lookupUnqualifiedType(DeclContext *dc, DeclName name,
         options.contains(NameLookupFlags::KnownPrivate),
         loc,
         /*OnlyTypes=*/true,
-        /*ProtocolMembers=*/true,
+        /*AllowProtocolMembers=*/true,
         options.contains(NameLookupFlags::IgnoreAccessibility));
 
     for (auto found : lookup.Results)