Merge pull request swiftlang#2120 from practicalswift/gardening-20160…

…409b
danielgindi · Apr 10, 2016 · c782dda · c782dda
2 parents 5701926 + 8720709
commit c782dda
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/lib/SILOptimizer/IPO/GlobalPropertyOpt.cpp b/lib/SILOptimizer/IPO/GlobalPropertyOpt.cpp
@@ -28,7 +28,7 @@
 
 using namespace swift;
 
-STATISTIC(NumPropertiesReplaced,    "Number of array property calls replaced");
+STATISTIC(NumPropertiesReplaced, "Number of array property calls replaced");
 
 namespace {
 

diff --git a/lib/SILOptimizer/Transforms/CopyForwarding.cpp b/lib/SILOptimizer/Transforms/CopyForwarding.cpp
@@ -72,9 +72,9 @@
 #include "llvm/Support/Debug.h"
 
 STATISTIC(NumCopyNRVO, "Number of copies removed via named return value opt.");
-STATISTIC(NumCopyForward, "Number of copies removed via forward propagation.");
+STATISTIC(NumCopyForward, "Number of copies removed via forward propagation");
 STATISTIC(NumCopyBackward,
-          "Number of copies removed via backward propagation.");
+          "Number of copies removed via backward propagation");
 
 using namespace swift;
 

diff --git a/lib/SILOptimizer/Transforms/RedundantOverflowCheckRemoval.cpp b/lib/SILOptimizer/Transforms/RedundantOverflowCheckRemoval.cpp
@@ -28,7 +28,7 @@
 
 using namespace swift;
 
-STATISTIC(NumCondFailRemoved,   "Number of cond_fail instructions removed");
+STATISTIC(NumCondFailRemoved, "Number of cond_fail instructions removed");
 
 namespace {
 

diff --git a/lib/SILOptimizer/Transforms/RemovePin.cpp b/lib/SILOptimizer/Transforms/RemovePin.cpp
@@ -33,7 +33,7 @@
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 
-STATISTIC(NumPinPairsRemoved, "Num pin pairs removed");
+STATISTIC(NumPinPairsRemoved, "Number of pin pairs removed");
 
 using namespace swift;
 

diff --git a/lib/SILOptimizer/Transforms/SILCodeMotion.cpp b/lib/SILOptimizer/Transforms/SILCodeMotion.cpp
@@ -30,8 +30,8 @@
 #include "llvm/ADT/Statistic.h"
 #include "llvm/Support/Debug.h"
 
-STATISTIC(NumSunk,   "Number of instructions sunk");
-STATISTIC(NumRefCountOpsSimplified, "number of enum ref count ops simplified.");
+STATISTIC(NumSunk, "Number of instructions sunk");
+STATISTIC(NumRefCountOpsSimplified, "Number of enum ref count ops simplified");
 STATISTIC(NumHoisted, "Number of instructions hoisted");
 
 using namespace swift;

diff --git a/lib/SILOptimizer/Transforms/SimplifyCFG.cpp b/lib/SILOptimizer/Transforms/SimplifyCFG.cpp
@@ -34,14 +34,14 @@
 #include "llvm/Support/CommandLine.h"
 using namespace swift;
 
-STATISTIC(NumBlocksDeleted,  "Number of unreachable blocks removed");
-STATISTIC(NumBlocksMerged,   "Number of blocks merged together");
-STATISTIC(NumJumpThreads,    "Number of jumps threaded");
-STATISTIC(NumTermBlockSimplified,  "Number of programterm block simplified");
+STATISTIC(NumBlocksDeleted, "Number of unreachable blocks removed");
+STATISTIC(NumBlocksMerged, "Number of blocks merged together");
+STATISTIC(NumJumpThreads, "Number of jumps threaded");
+STATISTIC(NumTermBlockSimplified, "Number of programterm block simplified");
 STATISTIC(NumConstantFolded, "Number of terminators constant folded");
-STATISTIC(NumDeadArguments,  "Number of unused arguments removed");
+STATISTIC(NumDeadArguments, "Number of unused arguments removed");
 STATISTIC(NumSROAArguments, "Number of aggregate argument levels split by "
-                            "SROA ");
+                            "SROA");
 
 //===----------------------------------------------------------------------===//
 //                             CFG Simplification

diff --git a/lib/SILOptimizer/Transforms/Sink.cpp b/lib/SILOptimizer/Transforms/Sink.cpp
@@ -36,7 +36,7 @@
 
 using namespace swift;
 
-STATISTIC(NumInstrSunk,   "Number of instructions sunk");
+STATISTIC(NumInstrSunk, "Number of instructions sunk");
 
 namespace {
 

diff --git a/lib/Sema/CSRanking.cpp b/lib/Sema/CSRanking.cpp
@@ -25,7 +25,7 @@ using namespace constraints;
 // Statistics
 //===----------------------------------------------------------------------===//
 #define DEBUG_TYPE "Constraint solver overall"
-STATISTIC(NumDiscardedSolutions, "# of solutions discarded");
+STATISTIC(NumDiscardedSolutions, "Number of solutions discarded");
 
 void ConstraintSystem::increaseScore(ScoreKind kind) {
   unsigned index = static_cast<unsigned>(kind);

diff --git a/tools/swift-llvm-opt/LLVMOpt.cpp b/tools/swift-llvm-opt/LLVMOpt.cpp
@@ -14,7 +14,7 @@
 ///
 /// This is a simple reimplementation of opt that includes support for Swift-
 /// specific LLVM passes. It is meant to make it easier to handle issues related
-/// to transitioning to the new LLVM pass manager (which lacks the dynamicism of
+/// to transitioning to the new LLVM pass manager (which lacks the dynamism of
 /// the old pass manager) and also problems during the code base transition to
 /// that pass manager. Additionally it will enable a user to exactly simulate
 /// Swift's LLVM pass pipeline by using the same pass pipeline building