Cherry-pick missed commits.

lldb/test/API/functionalities/data-formatter/swift-unsafe/main.swift

@@ -103,6 +103,7 @@ func main() {
 
   colors.withUnsafeBufferPointer {
     let buf = $0
+    print("break")
     //% self.expect("frame variable -d run-target buf",
     //%            patterns=[
     //%            '\(UnsafeBufferPointer<(.*)\.ColorCode>\) buf = 2 values \(0[xX][0-9a-fA-F]+\) {',
@@ -139,6 +140,7 @@ func main() {
 
   numbers.withUnsafeBufferPointer {
     let buf = $0
+    print("break")
     //% self.expect("frame variable -d run-target buf",
     //%            patterns=[
     //%            '\(UnsafeBufferPointer<(.*)\.Number<Double>>\) buf = 2 values \(0[xX][0-9a-fA-F]+\) {',
@@ -153,20 +155,23 @@ func main() {
   bytes.withUnsafeBufferPointer {
     let buf = $0
     let rawbuf = UnsafeRawBufferPointer(buf)
+    print("break")
     //% self.expect("frame variable -d run-target rawbuf",
     //%            patterns=[
     //%            '\(UnsafeRawBufferPointer\) rawbuf = 256 values \(0[xX][0-9a-fA-F]+\) {',
     //%            '\[([0-9]+)\] = (\\1)'
     //%            ])
     typealias ByteBuffer = UnsafeRawBufferPointer;
     let alias = rawbuf as ByteBuffer
+    print("break")
     //% self.expect("frame variable -d run-target alias",
     //%            patterns=[
     //%            '\(ByteBuffer\) alias = 256 values \(0[xX][0-9a-fA-F]+\) {',
     //%            '\[([0-9]+)\] = (\\1)',
     //%            ])
     typealias ByteBufferAlias = ByteBuffer
     let secondAlias = alias as ByteBufferAlias
+    print("break")
     //% self.expect("frame variable -d run-target secondAlias",
     //%            patterns=[
     //%            '\(ByteBufferAlias\) secondAlias = 256 values \(0[xX][0-9a-fA-F]+\) {',

lldb/test/API/lang/swift/generic_class/main.swift

@@ -11,7 +11,7 @@ protocol P {
 }
 extension F : P {
   @inline(never) func method() {
-    print("break here \(b)")
+    print("break here \(b) \(self)")
   }
 }
 

lldb/test/API/lang/swift/stepping/TestSwiftStepping.py

@@ -200,9 +200,10 @@ def do_test(self):
         thread.StepOver()
         self.hit_correct_line(thread, "At point initializer.")
         thread.StepOver()
-        self.hit_correct_line (thread, "At the beginning of the switch.")
+        stopped_at_switch = self.hit_correct_line (thread, "At the beginning of the switch.", False)
+        if stopped_at_switch:
+            thread.StepOver()
 
-        thread.StepOver()
         stopped_at_case = self.hit_correct_line(
             thread, "case (let x, let y) where", False)
         if stopped_at_case:
@@ -312,6 +313,10 @@ def do_test(self):
         if stop_on_partial_apply:
             thread.StepOver()
 
+        stop_at_brace = self.hit_correct_line(thread, "Opening brace", False)
+        if stop_at_brace:
+            thread.StepOver()
+
         self.hit_correct_line(thread, "doSomethingWithFunction(cd_maker, 10)")
 
         thread.StepInto()

lldb/test/API/lang/swift/stepping/main.swift

@@ -205,7 +205,7 @@ func main () -> Void
     indirect.protocol_func(20)
 
     var cd_maker = 
-    { 
+    { // Opening brace
         (arg : Int) -> ConformsDirectly in  // Step into cd_maker stops at closure decl instead.
             return ConformsDirectly(arg) // Step into should stop here in closure.
     }