Merge pull request #9278 from practicalswift/gardening-20170504

Author: swift-ci

benchmark/scripts/compare_perf_tests.py

@@ -43,10 +43,6 @@ def sd(self):  # Standard Deviation (ms)
         return (0 if self.samples < 2 else
                 sqrt(self.S_runtime / (self.samples - 1)))
 
-    @property
-    def cv(self):  # Coeficient of Variation (%)
-        return self.sd / self.mean
-
     # Compute running variance, B. P. Welford's method
     # See Knuth TAOCP vol 2, 3rd edition, page 232, or
     # https://www.johndcook.com/blog/standard_deviation/
@@ -299,7 +295,6 @@ def row(name, old, new, delta, speedup, speedup_color):
                 name, old, new, delta, speedup_color, speedup)
 
         def header(contents):
-            # exit(contents)
             return self.HTML_HEADER_ROW.format(* contents)
 
         def table(title, results, speedup_color):

benchmark/single-source/SortLargeExistentials.swift

@@ -1,4 +1,4 @@
-//===--- SortLettersInPlace.swift -----------------------------------------===//
+//===--- SortLargeExistentials.swift --------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //

include/swift/AST/DiagnosticsParse.def

@@ -1167,9 +1167,6 @@ ERROR(string_interpolation_extra,none,
       "extra tokens after interpolated string expression", ())
 
 // Keypath expressions.
-ERROR(expr_keypath_invalid_component,PointsToFirstBadToken,
-      "key path can only contain property, subscript, optional chaining, or "
-      "optional force-unwrapping components", ())
 ERROR(expr_keypath_expected_lparen,PointsToFirstBadToken,
       "expected '(' following '#keyPath'", ())
 ERROR(expr_keypath_expected_property_or_type,PointsToFirstBadToken,

lib/AST/GenericSignatureBuilder.cpp

@@ -2567,7 +2567,7 @@ ConstraintResult GenericSignatureBuilder::addConformanceRequirement(
     return Type();
   };
 
-  // An an inferred same-type requirement between the two type declarations
+  // An inferred same-type requirement between the two type declarations
   // within this protocol or a protocol it inherits.
   auto addInferredSameTypeReq = [&](TypeDecl *first, TypeDecl *second) {
     Type firstType = formUnsubstitutedType(first);

lib/IDE/APIDigesterData.cpp

@@ -415,7 +415,7 @@ struct swift::ide::api::APIDiffItemStore::Implementation {
         APIDiffItem *Item = serializeDiffItem(Allocator,
           cast<llvm::yaml::MappingNode>(&*It));
         auto &Bag = Data[Item->getKey()];
-        if(std::find_if(Bag.begin(), Bag.end(),
+        if (std::find_if(Bag.begin(), Bag.end(),
             [&](APIDiffItem* I) { return *Item == *I; }) == Bag.end()) {
           Bag.push_back(Item);
           AllItems.push_back(Item);

lib/IRGen/LoadableByAddress.cpp

@@ -433,11 +433,11 @@ static bool modifiableApply(ApplySite applySite, irgen::IRGenModule &Mod) {
     return false;
   }
   auto callee = applySite.getCallee();
-  if (dyn_cast<ProjectBlockStorageInst>(callee)) {
+  if (isa<ProjectBlockStorageInst>(callee)) {
     return false;
   } else if (LoadInst *instr = dyn_cast<LoadInst>(callee)) {
     auto loadedSrcValue = instr->getOperand();
-    if (dyn_cast<ProjectBlockStorageInst>(loadedSrcValue)) {
+    if (isa<ProjectBlockStorageInst>(loadedSrcValue)) {
       return false;
     }
   }
@@ -1877,7 +1877,7 @@ void LoadableByAddress::run() {
           }
         } else if (auto *SI = dyn_cast<StoreInst>(&I)) {
           auto dest = SI->getDest();
-          if (dyn_cast<ProjectBlockStorageInst>(dest)) {
+          if (isa<ProjectBlockStorageInst>(dest)) {
             storeToBlockStorageInstrs.insert(SI);
           }
         }

lib/Migrator/Migrator.cpp

@@ -1,4 +1,4 @@
-//===--- Migrator.cpp -----------------------------------------------------===////
+//===--- Migrator.cpp -----------------------------------------------------===//
 // This source file is part of the Swift.org open source project
 //
 // Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors

lib/Migrator/SyntacticMigratorPass.cpp

@@ -316,7 +316,7 @@ struct SyntacticMigratorPass::Implementation : public SourceEntityWalker {
   void handleFuncRename(ValueDecl *FD, Expr* FuncRefContainer, Expr *Arg) {
     bool IgnoreBase = false;
     if (auto View = getFuncRename(FD, IgnoreBase)) {
-      if(!IgnoreBase) {
+      if (!IgnoreBase) {
         ReferenceCollector Walker(FD);
         Walker.walk(FuncRefContainer);
         Editor.replace(Walker.Result, View.base());
@@ -337,7 +337,7 @@ struct SyntacticMigratorPass::Implementation : public SourceEntityWalker {
 
   void handleFunctionCallToPropertyChange(ValueDecl *FD, Expr* FuncRefContainer,
                                           Expr *Arg) {
-    for(auto *Item :getRelatedDiffItems(FD)) {
+    for (auto *Item : getRelatedDiffItems(FD)) {
       if (auto *CD = dyn_cast<CommonDiffItem>(Item)) {
         switch (CD->DiffKind) {
         case NodeAnnotation::GetterToProperty: {

lib/SILOptimizer/Mandatory/DefiniteInitialization.cpp

@@ -28,7 +28,6 @@
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/Debug.h"
-#include "llvm/Support/CommandLine.h"
 
 #ifdef SWIFT_SILOPTIMIZER_PASSMANAGER_DIMEMORYUSECOLLECTOR_H
 #error "Included non ownership header?!"

test/Interpreter/subclass_existentials_objc.swift

@@ -1,4 +1,4 @@
-//===--- subclass_existentials.swift --------------------------------------===//
+//===--- subclass_existentials_objc.swift ---------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //

validation-test/SIL/crashers_fixed/020-swift-moduledecl-lookupconformance.sil

@@ -1,3 +1,2 @@
 // RUN: not %target-sil-opt %s
-// REQUIRES: asserts
 enum l<V>:V