[Test] Adapted test to different borrow scopes.

Borrow scopes were moved when lexical borrow scopes were no longer
emitted for owned arguments.  Now, they are emitted when guaranteed
values are needed.  Fixing these diagnostics will be tracked separately.
The same issue is already visible elsewhere in this test file, e.g. in
castTestSwitch1, castTestSwitch2, and castTestSwitchInLoop.

Author: nate-chandler

test/SILOptimizer/move_function_kills_copyable_values.swift

@@ -232,13 +232,13 @@ public func patternMatchSwitchLet2(_ x: __owned (Klass?, Klass?)?) {
 
 public func patternMatchSwitchLet3(_ x: __owned (Klass?, Klass?)?) { // expected-error {{'x' used after being moved}}
     let _ = _move x // expected-note {{move here}}
-    switch x { // expected-note {{use here}}
+    switch x {
     case .some((.some(_), .some(let z))): // expected-error {{'z' used after being moved}}
         let _ = _move z // expected-note {{move here}}
         nonConsumingUse(z) // expected-note {{use here}}
     default:
         break
-    }
+    } // expected-note {{use here}} expected-note {{use here}}
 }
 
 ////////////////
@@ -296,31 +296,31 @@ public func castTest2(_ x: __owned Klass) -> SubKlass1? { // expected-error {{'x
 public func castTestSwitch1(_ x : __owned Klass) { // expected-error {{'x' used after being moved}}
     let _ = _move x // expected-note {{move here}}
     switch x {
-    case let k as SubKlass1: // expected-note {{use here}}
+    case let k as SubKlass1:
         print(k)
     default:
         print("Nope")
-    }
+    } // expected-note {{use here}} expected-note {{use here}}
 }
 
 public func castTestSwitch2(_ x : __owned Klass) { // expected-error {{'x' used after being moved}}
     let _ = _move x // expected-note {{move here}}
     switch x {
     case let k as SubKlass1:
         print(k)
-    case let k as SubKlass2: // expected-note {{use here}}
+    case let k as SubKlass2:
         print(k)
     default:
         print("Nope")
-    }
+    } // expected-note {{use here}} expected-note {{use here}} expected-note {{use here}}
 }
 
 public func castTestSwitchInLoop(_ x : __owned Klass) { // expected-error {{'x' used after being moved}}
     let _ = _move x // expected-note {{move here}}
 
     for _ in 0..<1024 {
         switch x {
-        case let k as SubKlass1: // expected-note {{use here}}
+        case let k as SubKlass1:
             print(k)
         default:
             print("Nope")