swiftlang · gribozavr · Dec 14, 2015 · Dec 13, 2015 · Dec 13, 2015 · Dec 13, 2015
diff --git a/include/swift/AST/Types.h b/include/swift/AST/Types.h
@@ -637,7 +637,7 @@ class alignas(1 << TypeAlignInBits) TypeBase {
   /// Swift-native reference counting?
   bool usesNativeReferenceCounting(ResilienceExpansion resilience);
 
-  /// Determines whether this type has a bridgable object
+  /// Determines whether this type has a bridgeable object
   /// representation, i.e., whether it is always represented as a single
   /// (non-nil) pointer that can be unknown-retained and
   /// unknown-released.

diff --git a/include/swift/SILOptimizer/Analysis/Analysis.h b/include/swift/SILOptimizer/Analysis/Analysis.h
@@ -132,7 +132,7 @@ namespace swift {
     static void verifyFunction(SILFunction *F);
   };
 
-  /// An abstract base class that implements the boiler plate of cacheing and
+  /// An abstract base class that implements the boiler plate of caching and
   /// invalidating analysis for specific functions.
   template<typename AnalysisTy>
   class FunctionAnalysisBase : public SILAnalysis {

diff --git a/include/swift/SILOptimizer/Analysis/EscapeAnalysis.h b/include/swift/SILOptimizer/Analysis/EscapeAnalysis.h
@@ -291,7 +291,7 @@ class EscapeAnalysis : public BottomUpIPAnalysis {
     }
   };
 
-  /// Mapping from nodes in a calleee-graph to nodes in a caller-graph.
+  /// Mapping from nodes in a callee-graph to nodes in a caller-graph.
   class CGNodeMap {
     /// The map itself.
     llvm::DenseMap<CGNode *, CGNode *> Map;

diff --git a/lib/SILOptimizer/LoopTransforms/ArrayBoundsCheckOpts.cpp b/lib/SILOptimizer/LoopTransforms/ArrayBoundsCheckOpts.cpp
@@ -707,7 +707,7 @@ static SILValue getSub(SILLocation Loc, SILValue Val, unsigned SubVal,
   return B.createTupleExtract(Loc, AI, 0);
 }
 
-/// A cannonical induction variable incremented by one from Start to End-1.
+/// A canonical induction variable incremented by one from Start to End-1.
 struct InductionInfo {
   SILArgument *HeaderVal;
   BuiltinInst *Inc;
@@ -883,7 +883,7 @@ static bool isGuaranteedToBeExecuted(DominanceInfo *DT, SILBasicBlock *Block,
   return DT->dominates(Block, ExitingBlk);
 }
 
-/// Describes the access function "a[f(i)]" that is based on a cannonical
+/// Describes the access function "a[f(i)]" that is based on a canonical
 /// induction variable.
 class AccessFunction {
   InductionInfo *Ind;
@@ -895,7 +895,7 @@ class AccessFunction {
 
   static AccessFunction getLinearFunction(SILValue Idx,
                                           InductionAnalysis &IndVars) {
-    // Match the actual induction variable burried in the integer struct.
+    // Match the actual induction variable buried in the integer struct.
     // %2 = struct $Int(%1 : $Builtin.Word)
     //    = apply %check_bounds(%array, %2) : $@convention(thin) (Int, ArrayInt) -> ()
     auto ArrayIndexStruct = dyn_cast<StructInst>(Idx);
@@ -1112,7 +1112,7 @@ static bool hoistBoundsChecks(SILLoop *Loop, DominanceInfo *DT, SILLoopInfo *LI,
 
   DEBUG(Preheader->getParent()->dump());
 
-  // Find cannonical induction variables.
+  // Find canonical induction variables.
   InductionAnalysis IndVars(DT, IVs, Preheader, Header, ExitingBlk, ExitBlk);
   bool IVarsFound = IndVars.analyse();
   if (!IVarsFound){

diff --git a/lib/SILOptimizer/LoopTransforms/COWArrayOpt.cpp b/lib/SILOptimizer/LoopTransforms/COWArrayOpt.cpp
@@ -1156,7 +1156,7 @@ bool COWArrayOpt::hoistInLoopWithOnlyNonArrayValueMutatingOperations() {
 
 
   /// Make sure that no writes to an array value happens in the loop and that
-  /// no array values are retained without beeing released before hitting a
+  /// no array values are retained without being released before hitting a
   /// make_unique:
   ///
   /// * array semantic functions that don't change the uniqueness state to

diff --git a/lib/SILOptimizer/LoopTransforms/LoopRotate.cpp b/lib/SILOptimizer/LoopTransforms/LoopRotate.cpp
@@ -277,7 +277,7 @@ bool swift::rotateLoop(SILLoop *L, DominanceInfo *DT, SILLoopInfo *LI,
   if (!Header)
     return false;
 
-  // We need a preheader - this is also a cannonicalization for follow-up
+  // We need a preheader - this is also a canonicalization for follow-up
   // passes.
   auto *Preheader = L->getLoopPreheader();
   if (!Preheader) {

diff --git a/lib/SILOptimizer/Utils/Local.cpp b/lib/SILOptimizer/Utils/Local.cpp
@@ -1244,7 +1244,7 @@ optimizeBridgedObjCToSwiftCast(SILInstruction *Inst,
 
   // Now emit the a cast from the casted ObjC object into a target type.
   // This is done by means of calling _forceBridgeFromObjectiveC or
-  // _conditionallyBridgeFromObjectiveC_birdgeable from the Target type.
+  // _conditionallyBridgeFromObjectiveC_bridgeable from the Target type.
   // Lookup the required function in the Target type.
 
   // Lookup the _ObjectiveCBridgeable protocol.

diff --git a/test/SILOptimizer/sil_combine.sil b/test/SILOptimizer/sil_combine.sil
@@ -2587,15 +2587,15 @@ bb0(%0 : $Builtin.NativeObject):
   return %0 : $Builtin.NativeObject
 }
 
-// CHECK-LABEL: sil @test_cmp_xor_cannonicalization
+// CHECK-LABEL: sil @test_cmp_xor_canonicalization
 // CHECK:bb0([[ARG:%.*]] : $Builtin.Int1
 // CHECK:  [[TRUE:%.*]] = integer_literal $Builtin.Int1, -1
 // CHECK:  [[FALSE:%.*]] = integer_literal $Builtin.Int1, 0
 // CHECK:  [[EQ:%.*]] = builtin "cmp_eq_Int1"([[ARG]] : $Builtin.Int1, [[FALSE]]
 // CHECK:  [[NOT:%.*]] = builtin "xor_Int1"([[EQ]] : $Builtin.Int1, [[TRUE]] : $Builtin.Int1)
 // CHECK:  return [[NOT]]
 
-sil @test_cmp_xor_cannonicalization : $@convention(thin) (Builtin.Int1) -> Builtin.Int1 {
+sil @test_cmp_xor_canonicalization : $@convention(thin) (Builtin.Int1) -> Builtin.Int1 {
 bb0(%0 : $Builtin.Int1):
   %1 = integer_literal $Builtin.Int1, -1
   %2 = builtin "cmp_eq_Int1"(%0 : $Builtin.Int1, %1 : $Builtin.Int1) : $Builtin.Int1

diff --git a/utils/build-script-impl b/utils/build-script-impl
@@ -111,10 +111,10 @@ KNOWN_SETTINGS=(
     skip-build-watchos-device   ""               "set to skip building Swift stdlibs for Apple watchOS devices (i.e. build simulators only)"
     skip-build-watchos-simulator ""              "set to skip building Swift stdlibs for Apple watchOS simulators (i.e. build devices only)"
     skip-build-lldb             ""               "set to skip building LLDB"
-    skip-build-llbuild          ""               "set to skip buildling llbuild"
-    skip-build-swiftpm          ""               "set to skip buildling swiftpm"
-    skip-build-xctest           ""               "set to skip buildling xctest"
-    skip-build-foundation       ""               "set to skip buildling foundation"
+    skip-build-llbuild          ""               "set to skip building llbuild"
+    skip-build-swiftpm          ""               "set to skip building swiftpm"
+    skip-build-xctest           ""               "set to skip building xctest"
+    skip-build-foundation       ""               "set to skip building foundation"
     skip-test-cmark             ""               "set to skip testing CommonMark"
     skip-test-lldb              ""               "set to skip testing lldb"
     skip-test-swift             ""               "set to skip testing Swift"