Merge pull request #6325 from practicalswift/gardening-20161216

Author: swift-ci

docs/ABI.rst

@@ -744,8 +744,8 @@ character.
 Some less important operators are longer and may also contain one or more
 natural numbers. But it's always important that the demangler can identify the
 end (the last character) of an operator. For example, it's not possible to
-determince the last character if there are two operators ``M`` and ``Ma``:
-``a`` could belong to ``M`` or it could be the first charater of the next
+determine the last character if there are two operators ``M`` and ``Ma``:
+``a`` could belong to ``M`` or it could be the first character of the next
 operator.
 
 The intention of the post-fix order is to optimize for common pre-fixes.
@@ -766,7 +766,7 @@ Globals
   global ::= type 'MP'                   // type metadata pattern
   global ::= type 'Ma'                   // type metadata access function
   global ::= type 'ML'                   // type metadata lazy cache variable
-  global ::= nomianl-type 'Mm'           // class metaclass
+  global ::= nominal-type 'Mm'           // class metaclass
   global ::= nominal-type 'Mn'           // nominal type descriptor
   global ::= protocol 'Mp'               // protocol descriptor
   global ::= type 'MF'                   // metadata for remote mirrors: field descriptor
@@ -1171,7 +1171,7 @@ values indicates a single generic parameter at the outermost depth::
   x_xCru                           // <T_0_0> T_0_0 -> T_0_0
   d_0__xCr_0_u                     // <T_0_0><T_1_0, T_1_1> T_0_0 -> T_1_1
 
-A generic signature must only preceed an operator character which is different
+A generic signature must only precede an operator character which is different
 from any character in a ``<GENERIC-PARAM-COUNT>``.
 
 Identifiers
@@ -1222,7 +1222,7 @@ A maximum of 26 words in a mangling can be used for substitutions.
 
 ::
 
-  identifier ::= '00' natural '_'? IDENTIFIER-CHAR+  // '_' is inserted if the identifer starts with a digit or '_'.
+  identifier ::= '00' natural '_'? IDENTIFIER-CHAR+  // '_' is inserted if the identifier starts with a digit or '_'.
 
 Identifiers that contain non-ASCII characters are encoded using the Punycode
 algorithm specified in RFC 3492, with the modifications that ``_`` is used
@@ -1274,7 +1274,7 @@ Substitutions
 
 ::
 
-  substitution ::= 'A' INDEX                  // substiution of N+26
+  substitution ::= 'A' INDEX                  // substitution of N+26
   substitution ::= 'A' [a-z]* [A-Z]           // One or more consecutive substitutions of N < 26
 
 
@@ -1346,7 +1346,7 @@ The type is the function type of the specialized function.
   specialization ::= spec-arg* 'Tf' SPEC-INFO ARG-SPEC-KIND* '_' ARG-SPEC-KIND  // Function signature specialization kind
 
 The ``<ARG-SPEC-KIND>`` describes how arguments are specialized.
-Some kinds need arguments, which preceed ``Tf``.
+Some kinds need arguments, which precede ``Tf``.
 
 ::
 

include/swift/AST/ASTMangler.h

@@ -109,7 +109,7 @@ class ASTMangler : public Mangler {
   std::string mangleGlobalInit(const VarDecl *decl, int counter,
                                bool isInitFunc);
 
-  std::string mangleReabstructionThunkHelper(CanSILFunctionType ThunkType,
+  std::string mangleReabstractionThunkHelper(CanSILFunctionType ThunkType,
                                              Type FromType, Type ToType,
                                              ModuleDecl *Module);
 

include/swift/AST/Decl.h

@@ -4051,7 +4051,7 @@ class AbstractStorageDecl : public ValueDecl {
     return OverriddenDecl;
   }
   void setOverriddenDecl(AbstractStorageDecl *over) {
-    // FIXME: Hack due to broken class circulatity checking.
+    // FIXME: Hack due to broken class circularity checking.
     if (over == this) return;
     OverriddenDecl = over;
     over->setIsOverridden();
@@ -5168,7 +5168,7 @@ class FuncDecl final : public AbstractFunctionDecl,
     return OverriddenOrBehaviorParamDecl.dyn_cast<FuncDecl *>();
   }
   void setOverriddenDecl(FuncDecl *over) {
-    // FIXME: Hack due to broken class circulatity checking.
+    // FIXME: Hack due to broken class circularity checking.
     if (over == this) return;
 
     // A function cannot be an override if it is also a derived global decl
@@ -5598,7 +5598,7 @@ class ConstructorDecl : public AbstractFunctionDecl {
 
   ConstructorDecl *getOverriddenDecl() const { return OverriddenDecl; }
   void setOverriddenDecl(ConstructorDecl *over) {
-    // FIXME: Hack due to broken class circulatity checking.
+    // FIXME: Hack due to broken class circularity checking.
     if (over == this) return;
 
     OverriddenDecl = over;

include/swift/AST/Pattern.h

@@ -131,7 +131,7 @@ class alignas(8) Pattern {
   /// Set the type of this pattern as an interface type whose resolution to
   /// a context type will be performed lazily.
   ///
-  /// \param dc The context in whch the type will be resolved.
+  /// \param dc The context in which the type will be resolved.
   void setDelayedInterfaceType(Type interfaceTy, DeclContext *dc);
 
   /// Overwrite the type of this pattern.

include/swift/AST/StmtTransformer.h

@@ -5,8 +5,8 @@
 // Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
-// See http://swift.org/LICENSE.txt for license information
-// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
 //

include/swift/Basic/ManglingUtils.h

@@ -205,7 +205,7 @@ void mangleIdentifier(Mangler &M, StringRef ident) {
       if (Idx < End - 2) {
         M.Buffer << (char)(Repl.WordIdx + 'a');
       } else {
-        // The last word substitution is a captial letter.
+        // The last word substitution is a capital letter.
         M.Buffer << (char)(Repl.WordIdx + 'A');
         if (Pos == ident.size())
           M.Buffer << '0';

include/swift/Basic/Punycode.h

@@ -18,7 +18,7 @@
 // - Encoding digits are represented using [a-zA-J] instead of [a-z0-9], because
 //   symbol names are case-sensitive, and Swift mangled identifiers cannot begin
 //   with a digit.
-// - Optinally, non-symbol ASCII characters (characters except [$_a-zA-Z0-9])
+// - Optionally, non-symbol ASCII characters (characters except [$_a-zA-Z0-9])
 //   are mapped to the code range 0xD800 - 0xD880 and are also encoded like
 //   non-ASCII unicode characters.
 //

include/swift/Basic/Unreachable.h

@@ -1,4 +1,4 @@
-//===--- Unreachable.h - Implements swift_unrachable ------------*- C++ -*-===//
+//===--- Unreachable.h - Implements swift_unreachable -----------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //

include/swift/SIL/SILInstruction.h

@@ -1766,7 +1766,7 @@ class BeginBorrowInst
 };
 
 /// Represents a store of a borrowed value into an address. Returns the borrowed
-/// address. Must be paired with a end_borrow in its use-def list.
+/// address. Must be paired with an end_borrow in its use-def list.
 class StoreBorrowInst : public SILInstruction {
   friend class SILBuilder;
 

include/swift/SILOptimizer/PassManager/PassPipeline.def

@@ -5,8 +5,8 @@
 // Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
-// See http://swift.org/LICENSE.txt for license information
-// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
 ///

include/swift/SILOptimizer/PassManager/PassPipeline.h

@@ -1,12 +1,12 @@
-//===--- PassPipeline.h ---------------------------------------------------===//
+//===--- PassPipeline.h -----------------------------------------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //
 // Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
-// See http://swift.org/LICENSE.txt for license information
-// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
 ///

lib/AST/ASTMangler.cpp

@@ -238,7 +238,7 @@ std::string ASTMangler::mangleGlobalInit(const VarDecl *decl, int counter,
   return finalize();
 }
 
-std::string ASTMangler::mangleReabstructionThunkHelper(
+std::string ASTMangler::mangleReabstractionThunkHelper(
                                             CanSILFunctionType ThunkType,
                                             Type FromType,
                                             Type ToType,

lib/AST/StmtTransformer.cpp

@@ -1,12 +1,12 @@
-//===--- Stmt.cpp - Swift Language Statement ASTs -------------------------===//
+//===--- StmtTransformer.cpp - Swift Language Statement ASTs --------------===//
 //
 // This source file is part of the Swift.org open source project
 //
 // Copyright (c) 2016 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
-// See http://swift.org/LICENSE.txt for license information
-// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
 //

lib/RemoteAST/InProcessMemoryReader.cpp

@@ -1,4 +1,4 @@
-//===--- InProcessMemoryReader.cpp - Reads local memory ---------*- C++ -*-===//
+//===--- InProcessMemoryReader.cpp - Reads local memory -------------------===//
 //
 // This source file is part of the Swift.org open source project
 //

lib/SILGen/SILGenDecl.cpp

@@ -2000,7 +2000,7 @@ getOrCreateReabstractionThunk(GenericEnvironment *genericEnv,
     std::string Old = mangler.finalize();
 
     NewMangling::ASTMangler NewMangler;
-    std::string New = NewMangler.mangleReabstructionThunkHelper(thunkType,
+    std::string New = NewMangler.mangleReabstractionThunkHelper(thunkType,
                        fromInterfaceType, toInterfaceType, M.getSwiftModule());
 
     name = NewMangling::selectMangling(Old, New);

lib/SILOptimizer/PassManager/PassPipeline.cpp

@@ -1,4 +1,4 @@
-//===--- Passes.cpp - Swift Compiler SIL Pass Entrypoints -----------------===//
+//===--- PassPipeline.cpp - Swift Compiler SIL Pass Entrypoints -----------===//
 //
 // This source file is part of the Swift.org open source project
 //

lib/SILOptimizer/UtilityPasses/BugReducerTester.cpp

@@ -5,8 +5,8 @@
 // Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
-// See http://swift.org/LICENSE.txt for license information
-// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
 ///

lib/Sema/CSDiag.cpp

@@ -4651,7 +4651,7 @@ static bool diagnoseImplicitSelfErrors(Expr *fnExpr, Expr *argExpr,
     return false;
 
   auto context = CS->DC;
-  using CandididateMap =
+  using CandidateMap =
       llvm::SmallDenseMap<ValueDecl *, llvm::SmallVector<OverloadChoice, 2>>;
 
   auto getBaseKind = [](ValueDecl *base) -> DescriptiveDeclKind {
@@ -4734,7 +4734,7 @@ static bool diagnoseImplicitSelfErrors(Expr *fnExpr, Expr *argExpr,
     if (!result || result.empty())
       continue;
 
-    CandididateMap candidates;
+    CandidateMap candidates;
     for (const auto &candidate : result) {
       auto base = candidate.Base;
       if ((base && base->isInvalid()) || candidate->isInvalid())

lib/Sema/ConstraintSystem.h

@@ -1135,7 +1135,7 @@ class ConstraintSystem {
 
   private:
     /// The list of constraints that have been retired along the
-    /// current path, this list is used in LIFO fasion when constaints
+    /// current path, this list is used in LIFO fashion when constraints
     /// are added back to the circulation.
     ConstraintList retiredConstraints;
 

lib/Sema/TypeChecker.h

@@ -1029,7 +1029,7 @@ class TypeChecker final : public LazyResolver {
   /// Revert the dependent types within the given generic parameter list.
   void revertGenericParamList(GenericParamList *genericParams);
 
-  /// Construct a new generic environonment for the given declaration context.
+  /// Construct a new generic environment for the given declaration context.
   ///
   /// \param genericParams The generic parameters to validate.
   ///
@@ -1052,7 +1052,7 @@ class TypeChecker final : public LazyResolver {
                         llvm::function_ref<void(ArchetypeBuilder &)>
                           inferRequirements);
 
-  /// Construct a new generic environonment for the given declaration context.
+  /// Construct a new generic environment for the given declaration context.
   ///
   /// \param genericParams The generic parameters to validate.
   ///

stdlib/public/SDK/Foundation/Data.swift

@@ -48,7 +48,7 @@ internal func _NSWriteDataToFile_Swift(url: NSURL, data: NSData, options: UInt,
 
 public final class _DataStorage {
     public enum Backing {
-        // A mirror of the objective-c implementation that is suitable to inline in swift
+        // A mirror of the Objective-C implementation that is suitable to inline in Swift
         case swift
 
         // these two storage points for immutable and mutable data are reserved for references that are returned by "known"
@@ -59,7 +59,7 @@ public final class _DataStorage {
         case immutable(NSData) // This will most often (perhaps always) be NSConcreteData
         case mutable(NSMutableData) // This will often (perhaps always) be NSConcreteMutableData
 
-        // These are reserved for foregin sources where neither Swift nor Foundation are fully certain whom they belong
+        // These are reserved for foreign sources where neither Swift nor Foundation are fully certain whom they belong
         // to from an object inheritance standpoint, this means that all bets are off and the values of bytes, mutableBytes,
         // and length cannot be cached. This also means that all methods are expected to dynamically dispatch out to the
         // backing reference.
@@ -759,7 +759,7 @@ public final class _DataStorage {
             return d
         case .customMutableReference(let d):
             // Because this is returning an object that may be mutated in the future it needs to create a copy to prevent
-            // any further mutations out from under the reciever
+            // any further mutations out from under the receiver
             return d.copy() as! NSData
         }
     }
@@ -865,7 +865,7 @@ internal class _NSSwiftData : NSData {
     override var bytes: UnsafeRawPointer {
         // NSData's byte pointer methods are not annotated for nullability correctly
         // (but assume non-null by the wrapping macro guards). This placeholder value
-        // is to work-around this bug. Any indirection to the underlying bytes of a NSData
+        // is to work-around this bug. Any indirection to the underlying bytes of an NSData
         // with a length of zero would have been a programmer error anyhow so the actual
         // return value here is not needed to be an allocated value. This is specifically
         // needed to live like this to be source compatible with Swift3. Beyond that point

stdlib/public/runtime/CMakeLists.txt

@@ -75,7 +75,7 @@ if(SWIFT_BUILD_STATIC_STDLIB AND "${sdk}" STREQUAL "LINUX")
   set(static_binary_lnk_file_list)
   string(TOLOWER "${sdk}" lowercase_sdk)
 
-  # These two libaries are only used with the static swiftcore
+  # These two libraries are only used with the static swiftcore
   add_library(swiftImageInspectionStatic STATIC ImageInspectionStatic.cpp)
   set_target_properties(swiftImageInspectionStatic PROPERTIES
     ARCHIVE_OUTPUT_DIRECTORY "${SWIFTSTATICLIB_DIR}/${lowercase_sdk}")

stdlib/public/runtime/ImageInspectionStatic.cpp

@@ -55,7 +55,7 @@ swift::initializeTypeMetadataRecordLookup() {
 
 // This is called from Errors.cpp when dumping a stack trace entry.
 // It could be implemented by parsing the ELF information in the
-// executable. For now it returns 0 for error (cant lookup address).
+// executable. For now it returns 0 for error (can't lookup address).
 int
 swift::lookupSymbol(const void *address, SymbolInfo *info) {
   return 0;

stdlib/public/runtime/ProtocolConformance.cpp

@@ -341,7 +341,7 @@ searchInConformanceCache(const Metadata *type,
         // An up-to-date entry for the original type is authoritative.
         isAuthoritative = true;
       } else {
-        // A up-to-date cached failure for a superclass of the type is not
+        // An up-to-date cached failure for a superclass of the type is not
         // authoritative: there may be a still-undiscovered conformance
         // for the original query type.
         isAuthoritative = false;

tools/sil-passpipeline-dumper/SILPassPipelineDumper.cpp

@@ -5,8 +5,8 @@
 // Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
-// See http://swift.org/LICENSE.txt for license information
-// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
 ///

utils/bug_reducer/bug_reducer/bug_reducer_utils.py

@@ -193,7 +193,8 @@ def __init__(self, config, tools, input_file):
     def tool(self):
         return self.tools.sil_func_extractor
 
-    def _cmdline(self, input_file, funclist_path, output_file='-', invert=False):
+    def _cmdline(self, input_file, funclist_path, output_file='-',
+                 invert=False):
         sanity_check_file_exists(input_file)
         sanity_check_file_exists(funclist_path)
         assert(isinstance(funclist_path, str))
@@ -204,13 +205,15 @@ def _cmdline(self, input_file, funclist_path, output_file='-', invert=False):
             base_args.append('-invert')
         return base_args
 
-    def _invoke(self, input_file, funclist_path, output_filename, invert=False):
+    def _invoke(self, input_file, funclist_path, output_filename,
+                invert=False):
         assert(isinstance(funclist_path, str))
         cmdline = self._cmdline(input_file, funclist_path, output_filename,
                                 invert)
         return br_call(cmdline)
 
-    def invoke_with_functions(self, funclist_path, output_filename, invert=False):
+    def invoke_with_functions(self, funclist_path, output_filename,
+                              invert=False):
         assert(isinstance(funclist_path, str))
         return self._invoke(self.input_file, funclist_path, output_filename,
                             invert)

utils/bug_reducer/bug_reducer/list_reducer.py

@@ -18,7 +18,7 @@ def __init__(self, l):
         self.max_iters_without_progress = 3
 
         # Maximal number of allowed single-element trim iterations. We add a
-        # threshhold here as single-element reductions may otherwise take a
+        # threshold here as single-element reductions may otherwise take a
         # very long time to complete.
         self.max_trim_iterations_without_back_jump = 3
         self.shuffling_enabled = True