Merge pull request swiftlang#9001 from practicalswift/gardening-20170425

practicalswift · web-flow · commit ab5aaeb35959 · 2017-04-26T09:28:24.000+02:00
[gardening] Unused variables. Unused diagnostics. Namespace comments. Typos.
diff --git a/include/swift/ABI/System.h b/include/swift/ABI/System.h
@@ -59,7 +59,7 @@
 // Weak references use a marker to tell when they are controlled by
 // the ObjC runtime and when they are controlled by the Swift runtime.
 // Non-ObjC platforms don't use this marker.
-#define SWIFT_ABI_DEFAULT_OBJC_WEAK_REFERENCE_MARKER_MASK  0
+#define SWIFT_ABI_DEFAULT_OBJC_WEAK_REFERENCE_MARKER_MASK 0
 #define SWIFT_ABI_DEFAULT_OBJC_WEAK_REFERENCE_MARKER_VALUE 0
 
 /*********************************** i386 *************************************/
diff --git a/include/swift/AST/DiagnosticsParse.def b/include/swift/AST/DiagnosticsParse.def
@@ -550,8 +550,6 @@ ERROR(sil_objc_with_tail_elements,none,
       "alloc_ref [objc] cannot have tail allocated elements", ())
 ERROR(found_unqualified_instruction_in_qualified_function,none,
       "found unqualified instruction in qualified function '%0'", (StringRef))
-ERROR(sil_unknown_access_kind_or_enforcement,none,
-      "expected access kind or enforcement", ())
 ERROR(sil_expected_access_kind,none,
       "%0 instruction must have explicit access kind", (StringRef))
 ERROR(sil_expected_access_enforcement,none,
@@ -1180,8 +1178,6 @@ ERROR(expr_keypath_expected_property_or_type,PointsToFirstBadToken,
       "expected property or type name within '#keyPath(...)'", ())
 ERROR(expr_keypath_expected_rparen,PointsToFirstBadToken,
       "expected ')' to complete '#keyPath' expression", ())
-ERROR(expr_keypath_compound_name,none,
-      "cannot use compound name %0 in '#keyPath' expression", (DeclName))
 
 // Selector expressions.
 ERROR(expr_selector_expected_lparen,PointsToFirstBadToken,
diff --git a/include/swift/Migrator/SyntacticMigratorPass.h b/include/swift/Migrator/SyntacticMigratorPass.h
@@ -36,7 +36,7 @@ class SyntacticMigratorPass {
   const clang::edit::Commit &getEdits() const;
 };
 
-} // end namespae migrator
+} // end namespace migrator
 } // end namespace swift
 
 #endif // SWIFT_MIGRATOR_SYNTACTICMIGRATORPASS_H
diff --git a/include/swift/Runtime/Config.h b/include/swift/Runtime/Config.h
@@ -134,9 +134,9 @@
 #define SWIFT_LLVM_CC_RegisterPreservingCC llvm::CallingConv::PreserveMost
 
 #if SWIFT_USE_SWIFTCALL
-#define SWIFT_LLVM_CC_SwiftCC  llvm::CallingConv::Swift
+#define SWIFT_LLVM_CC_SwiftCC llvm::CallingConv::Swift
 #else
-#define SWIFT_LLVM_CC_SwiftCC  llvm::CallingConv::C
+#define SWIFT_LLVM_CC_SwiftCC llvm::CallingConv::C
 #endif
 
 // If defined, it indicates that runtime function wrappers
diff --git a/include/swift/SIL/SILInstruction.h b/include/swift/SIL/SILInstruction.h
@@ -4994,7 +4994,7 @@ class EndLifetimeInst
 
 /// An unsafe conversion in between ownership kinds.
 ///
-/// This is used today in destructors where due to objective-c legacy
+/// This is used today in destructors where due to Objective-C legacy
 /// constraints, we need to be able to convert a guaranteed parameter to an owned
 /// parameter.
 class UncheckedOwnershipConversionInst
diff --git a/lib/AST/ASTMangler.cpp b/lib/AST/ASTMangler.cpp
@@ -1036,7 +1036,7 @@ void ASTMangler::appendImplFunctionType(SILFunctionType *fn) {
 /// Mangle the context of the given declaration as a <context.
 /// This is the top-level entrypoint for mangling <context>.
 void ASTMangler::appendContextOf(const ValueDecl *decl) {
-  // Declarations provided provided by a C module have a special context
+  // Declarations provided by a C module have a special context
   // mangling.
   //   known-context ::= 'So'
   //
diff --git a/lib/AST/ProtocolConformance.cpp b/lib/AST/ProtocolConformance.cpp
@@ -813,7 +813,7 @@ ProtocolConformance::subst(Type substType,
              && "substitution mapped to different nominal?!");
 
       SubstitutionMap subMap;
-      if (auto *genericSig = getGenericSignature()) {
+      if (getGenericSignature()) {
         auto *genericEnv = getGenericEnvironment();
         subMap = genericEnv->getSubstitutionMap(subs, conformances);
       }
diff --git a/lib/IDE/SwiftSourceDocInfo.cpp b/lib/IDE/SwiftSourceDocInfo.cpp
@@ -918,7 +918,7 @@ getCallArgLabelRanges(SourceManager &SM, Expr *Arg, LabelRangeEndAt EndKind) {
   std::vector<CharSourceRange> Ranges;
   if (TupleExpr *TE = dyn_cast<TupleExpr>(Arg)) {
     size_t ElemIndex = 0;
-    for(Expr *Elem: TE->getElements()) {
+    for (Expr *Elem : TE->getElements()) {
       SourceLoc LabelStart(Elem->getStartLoc());
       SourceLoc LabelEnd(LabelStart);
 
diff --git a/lib/Index/Index.cpp b/lib/Index/Index.cpp
@@ -312,7 +312,7 @@ class IndexSwiftASTWalker : public SourceEntityWalker {
     if (NameLoc.isCompound()) {
       size_t LabelIndex = 0;
       SourceLoc ArgLoc;
-      while((ArgLoc = NameLoc.getArgumentLabelLoc(LabelIndex++)).isValid()) {
+      while ((ArgLoc = NameLoc.getArgumentLabelLoc(LabelIndex++)).isValid()) {
         LabelLocs.push_back(ArgLoc);
       }
     } else if (auto *CallParent = dyn_cast_or_null<CallExpr>(getParentExpr())) {
@@ -329,7 +329,7 @@ class IndexSwiftASTWalker : public SourceEntityWalker {
       return;
 
     auto LabelIt = LabelLocs.begin();
-    for(auto Prop : TypeContext->getStoredProperties()) {
+    for (auto Prop : TypeContext->getStoredProperties()) {
       if (Prop->getParentInitializer() && Prop->isLet())
         continue;
 
diff --git a/lib/SIL/SILBuilder.cpp b/lib/SIL/SILBuilder.cpp
@@ -345,7 +345,7 @@ SILValue SILBuilder::emitObjCToThickMetatype(SILLocation Loc, SILValue Op,
   return createObjCToThickMetatype(Loc, Op, Ty);
 }
 
-/// Add opned archetypes defined or used by the current instruction.
+/// Add opened archetypes defined or used by the current instruction.
 /// If there are no such opened archetypes in the current instruction
 /// and it is an instruction with just one operand, try to perform
 /// the same action for the instruction defining an operand, because
diff --git a/lib/SIL/SILFunctionType.cpp b/lib/SIL/SILFunctionType.cpp
@@ -1937,13 +1937,11 @@ static CanType copyOptionalityFromDerivedToBase(TypeConverter &tc,
                                                 CanType base) {
   // Unwrap optionals, but remember that we did.
   bool derivedWasOptional = false;
-  bool baseWasOptional = false;
   if (auto object = derived.getAnyOptionalObjectType()) {
     derivedWasOptional = true;
     derived = object;
   }
   if (auto object = base.getAnyOptionalObjectType()) {
-    baseWasOptional = true;
     base = object;
   }
 
diff --git a/lib/SILOptimizer/IPO/EagerSpecializer.cpp b/lib/SILOptimizer/IPO/EagerSpecializer.cpp
@@ -249,7 +249,7 @@ emitInvocation(SILBuilder &Builder,
                                 Builder.getModule());
 
   bool isNonThrowing = false;
-  // It it a function whose type claims it is throwing, but
+  // It is a function whose type claims it is throwing, but
   // it actually never throws inside its body?
   if (CanSILFuncTy->hasErrorResult() &&
       CalleeFunc->findThrowBB() == CalleeFunc->end()) {
diff --git a/lib/SILOptimizer/Mandatory/ConstantPropagation.cpp b/lib/SILOptimizer/Mandatory/ConstantPropagation.cpp
@@ -318,7 +318,7 @@ static SILInstruction *constantFoldCompare(BuiltinInst *BI,
     }
   }
 
-  // At the same time (x>>n) > Int.max and  Int.max < (x>>n) is false.
+  // At the same time (x>>n) > Int.max and Int.max < (x>>n) is false.
   if (match(BI,
             m_CombineOr(
                 // Int.max < x
diff --git a/lib/SILOptimizer/Mandatory/DiagnoseStaticExclusivity.cpp b/lib/SILOptimizer/Mandatory/DiagnoseStaticExclusivity.cpp
@@ -95,7 +95,7 @@ class ObjectProjection {
 ///
 /// The key invariant that this class must maintain is that if it says
 /// two storage locations are the same then they must be the same at run time.
-/// It is  allowed to err on the other side: it may imprecisely fail to
+/// It is allowed to err on the other side: it may imprecisely fail to
 /// recognize that two storage locations that represent the same run-time
 /// location are in fact the same.
 class AccessedStorage {
@@ -138,7 +138,7 @@ class AccessedStorage {
   }
 
   /// Returns the ValueDecl for the underlying storage, if it can be
-  /// determined. Otherwise returns null. For diagonostic purposes.
+  /// determined. Otherwise returns null. For diagnostic purposes.
   const ValueDecl *getStorageDecl() const {
     switch(Kind) {
     case AccessedStorageKind::GlobalVar:
diff --git a/lib/SILOptimizer/Utils/Generics.cpp b/lib/SILOptimizer/Utils/Generics.cpp
@@ -848,7 +848,7 @@ namespace swift {
 
 /// A helper class for creating partially specialized function signatures.
 ///
-/// The following naming convention is used to describe the memebrs and
+/// The following naming convention is used to describe the members and
 /// functions:
 /// Caller - the function which invokes the callee.
 /// Callee - the callee to be specialized.
diff --git a/lib/Sema/CSDiag.cpp b/lib/Sema/CSDiag.cpp
@@ -2687,10 +2687,6 @@ diagnoseUnviableLookupResults(MemberLookupResult &result, Type baseObjTy,
                               SourceLoc loc) {
   SourceRange baseRange = baseExpr ? baseExpr->getSourceRange() : SourceRange();
   
-  // Don't noise up diagnostics with reports about global keypath subscripts.
-  SmallVector<std::pair<ValueDecl*, MemberLookupResult::UnviableReason>, 4>
-   unviableCandidatesToReport;
-  
   // If we found no results at all, mention that fact.
   if (result.UnviableCandidates.empty()) {
     LookupResult correctionResults;
diff --git a/stdlib/private/StdlibCollectionUnittest/CheckMutableCollectionType.swift.gyb b/stdlib/private/StdlibCollectionUnittest/CheckMutableCollectionType.swift.gyb
@@ -489,7 +489,7 @@ func checkSortedPredicateThrow(
     result = try c.sorted {
       (lhs, rhs) throws -> Bool in
       _blackHole(closureLifetimeTracker)
-      if  throwElement == extractValue(rhs).value {
+      if throwElement == extractValue(rhs).value {
         thrown = true
         throw SillyError.JazzHands
       }
@@ -1005,7 +1005,7 @@ func checkSortPredicateThrow(
     try c.sort {
       (lhs, rhs) throws -> Bool in
       _blackHole(closureLifetimeTracker)
-      if  throwElement == extractValue(rhs).value {
+      if throwElement == extractValue(rhs).value {
         throw SillyError.JazzHands
       }
       return lessImpl(extractValue(lhs).value, extractValue(rhs).value)
diff --git a/stdlib/public/SwiftShims/KeyPath.h b/stdlib/public/SwiftShims/KeyPath.h
@@ -20,7 +20,8 @@
 #include "SwiftStdint.h"
 
 #ifdef __cplusplus
-namespace swift { extern "C" {
+namespace swift {
+extern "C" {
 #endif
 
 // Bitfields for the key path buffer header.
@@ -87,7 +88,8 @@ static const __swift_uint32_t _SwiftKeyPathComponentHeader_ComputedUnresolvedIDF
 
 
 #ifdef __cplusplus
-}} // namespace swift } extern "C" }
+} // extern "C"
+} // namespace swift
 #endif
 
 #endif // __SWIFT_SHIMS_KEYPATH_H__
diff --git a/stdlib/public/core/StringRangeReplaceableCollection.swift.gyb b/stdlib/public/core/StringRangeReplaceableCollection.swift.gyb
@@ -425,13 +425,13 @@ extension String {
 }
 
 extension String {
-  @available(*, unavailable, message: "Operator '+' cannot be used to append a String to a seqeunce of strings")
+  @available(*, unavailable, message: "Operator '+' cannot be used to append a String to a sequence of strings")
   public static func + <S : Sequence>(lhs: S, rhs: String) -> Never
     where S.Iterator.Element == String {
       fatalError()
   }
 
-  @available(*, unavailable, message: "Operator '+' cannot be used to append a String to a seqeunce of strings")
+  @available(*, unavailable, message: "Operator '+' cannot be used to append a String to a sequence of strings")
   public static func + <S : Sequence>(lhs: String, rhs: S) -> Never
     where S.Iterator.Element == String {
       fatalError()
diff --git a/test/IRGen/keypaths.sil b/test/IRGen/keypaths.sil
@@ -160,7 +160,7 @@ sil_vtable C {}
 // CHECK-64-SAME: i32 -2147483620,
 //              -- 0x8000_0010 - instantiable in-line, size 16
 // CHECK-32-SAME: i32 -2147483636,
-// -- 0x3c00_0000 - computed, settable, nmutating, identified by property offset, no args
+// -- 0x3c00_0000 - computed, settable, nonmutating, identified by property offset, no args
 // CHECK-SAME: i32 1006632960,
 // CHECK-SAME: [[WORD]]
 // CHECK-SAME: void (%swift.function*, %T8keypaths1SV*)* @m_get,
diff --git a/test/Parse/recovery.swift b/test/Parse/recovery.swift
@@ -714,7 +714,7 @@ func test23086402(a: A23086402) {
 // and `ss + s` becomes ambiguous. Diambiguation is provided with the unavailable overload
 // in order to produce a meaningful diagnostics. (Related: <rdar://problem/31763930>)
 func test23550816(ss: [String], s: String) {
-  print(ss + s)  // expected-error {{'+' is unavailable: Operator '+' cannot be used to append a String to a seqeunce of strings}}
+  print(ss + s)  // expected-error {{'+' is unavailable: Operator '+' cannot be used to append a String to a sequence of strings}}
 }
 
 // <rdar://problem/23719432> [practicalswift] Compiler crashes on &(Int:_)
diff --git a/test/SILOptimizer/capture_promotion_generic_context.sil b/test/SILOptimizer/capture_promotion_generic_context.sil
@@ -85,7 +85,7 @@ struct R<T> {
 // CHECK:         switch_enum %2 : $E<(R<T>) -> Builtin.Int32>
 // CHECK-NOT:     project_box
 // CHECK:       } // end sil function '_T023generic_promotable_box2Tf2nni_n'
-sil @generic_promotable_box2 : $@convention(thin) <T> (@in R<T>, @in Int, <τ_0_0> { var  E<(R<τ_0_0>) -> Int> } <T>) -> () {
+sil @generic_promotable_box2 : $@convention(thin) <T> (@in R<T>, @in Int, <τ_0_0> { var E<(R<τ_0_0>) -> Int> } <T>) -> () {
 entry(%0: $*R<T>, %1 : $*Int, %b : $<τ_0_0> { var E< (R<τ_0_0>)->Int > } <T>):
   %a = project_box %b : $<τ_0_0> { var E<(R<τ_0_0>)->Int> } <T>, 0
   %e = load %a : $*E<(R<T>)->Int>
diff --git a/test/SILOptimizer/constant_propagation.sil b/test/SILOptimizer/constant_propagation.sil
@@ -307,7 +307,7 @@ bb0:
 
 // For any x of the same size as Int.max and n>=1 , (x>>n) is always <= Int.max,
 // that is (x>>n) <= Int.max and Int.max >= (x>>n) are true.
-// At the same time (x>>n) > Int.max and  Int.max < (x>>n) is always false.
+// At the same time (x>>n) > Int.max and Int.max < (x>>n) is always false.
 sil @fold_cmp_lshr_with_IntMax : $@convention(thin) (Builtin.Int64) -> Builtin.Int64 {
 bb0(%0 : $Builtin.Int64):
   %1 = integer_literal $Builtin.Int64, 9223372036854775807 
diff --git a/test/SILOptimizer/exclusivity_static_diagnostics.sil b/test/SILOptimizer/exclusivity_static_diagnostics.sil
@@ -339,7 +339,7 @@ bb0(%0 : $Int):
 // Multiple errors accessing the same location
 
 // If we have a sequence of begin read - begin write - begin read accesses make
-// sure the the second read doesn't report a confusing read-read conflict.
+// sure the second read doesn't report a confusing read-read conflict.
 // CHECK-LABEL: sil hidden @readWriteReadConflictingThirdAccess
 sil hidden @readWriteReadConflictingThirdAccess : $@convention(thin) (Int) -> () {
 bb0(%0 : $Int):
diff --git a/tools/SourceKit/tools/sourcekitd-test/sourcekitd-test.cpp b/tools/SourceKit/tools/sourcekitd-test/sourcekitd-test.cpp
@@ -1352,10 +1352,8 @@ static void printRangeInfo(sourcekitd_variant_t Info, StringRef FilenameIn,
   sourcekitd_variant_t OffsetObj =
     sourcekitd_variant_dictionary_get_value(Info, KeyOffset);
   llvm::Optional<int64_t> Offset;
-  unsigned Length = 0;
   if (sourcekitd_variant_get_type(OffsetObj) != SOURCEKITD_VARIANT_TYPE_NULL) {
     Offset = sourcekitd_variant_int64_get_value(OffsetObj);
-    Length = sourcekitd_variant_dictionary_get_int64(Info, KeyLength);
   }
   const char *Kind = sourcekitd_uid_get_string_ptr(KindUID);
   const char *Typename = sourcekitd_variant_dictionary_get_string(Info,
diff --git a/tools/swift-ide-test/swift-ide-test.cpp b/tools/swift-ide-test/swift-ide-test.cpp
@@ -2553,7 +2553,7 @@ class TypeReconstructWalker : public SourceEntityWalker {
   }
 
   bool walkToDeclPost(Decl *D) override {
-    if (auto *VD = dyn_cast<ValueDecl>(D))
+    if (isa<ValueDecl>(D))
       NestedDCs.pop_back();
     return true;
   }

Original file line number	Diff line number	Diff line change
`@@ -813,7 +813,7 @@ ProtocolConformance::subst(Type substType,`
`813`	`813`	`&& "substitution mapped to different nominal?!");`
`814`	`814`
`815`	`815`	`SubstitutionMap subMap;`
`816`		`- if (auto *genericSig = getGenericSignature()) {`
	`816`	`+ if (getGenericSignature()) {`
`817`	`817`	`auto *genericEnv = getGenericEnvironment();`
`818`	`818`	`subMap = genericEnv->getSubstitutionMap(subs, conformances);`
`819`	`819`	`}`
Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ SILValue SILBuilder::emitObjCToThickMetatype(SILLocation Loc, SILValue Op,`
`345`	`345`	`return createObjCToThickMetatype(Loc, Op, Ty);`
`346`	`346`	`}`
`347`	`347`
`348`		`-/// Add opned archetypes defined or used by the current instruction.`
	`348`	`+/// Add opened archetypes defined or used by the current instruction.`
`349`	`349`	`/// If there are no such opened archetypes in the current instruction`
`350`	`350`	`/// and it is an instruction with just one operand, try to perform`
`351`	`351`	`/// the same action for the instruction defining an operand, because`