Merge pull request #610 from frootloops/patch-3

Fix some guidelines violations and typos

Author: gribozavr

lib/SILOptimizer/LoopTransforms/ArrayBoundsCheckOpts.cpp

@@ -919,7 +919,7 @@ class AccessFunction {
   }
 
   /// Hoists the necessary check for beginning and end of the induction
-  /// encapsulated by this acess function to the header.
+  /// encapsulated by this access function to the header.
   void hoistCheckToPreheader(ArraySemanticsCall CheckToHoist,
                              SILBasicBlock *Preheader,
                              DominanceInfo *DT) {

test/SILGen/coverage_member_closure.swift

@@ -10,6 +10,6 @@ class C {
 
   // Closures in members show up at the end of the constructor's map.
   // CHECK-NOT: sil_coverage_map
-  // CHECK: [[@LINE+1]]:55 -> [[@LINE+1]]:77 : 2
-  var completionHandler: (String, [String]) -> Void = {(foo, bar) in return}
+  // CHECK: [[@LINE+1]]:55 -> [[@LINE+1]]:79 : 2
+  var completionHandler: (String, [String]) -> Void = { (foo, bar) in return }
 }

test/sil-extract/basic.swift

@@ -69,17 +69,17 @@ struct X {
 }
 
 class Vehicle {
-    var num_of_wheels: Int
+    var numOfWheels: Int
 
     init(n: Int) {
-      num_of_wheels = n
+      numOfWheels = n
     }
 
     func now() -> Int {
-        return num_of_wheels;
+        return numOfWheels
     }
 }
 
 func foo() -> Int {
-  return 7;
+  return 7
 }