Skip to content

Commit 6bb1826

Browse files
nate-chandlernate-chandler
committed
[Test] Adjusted SIL tests.
Now that - owned arguments don't get lexical borrow scopes from SILGen - owned arguments get lexical moves during inlining unless the value passed for that argument is already lexical - guaranteed arguments don't get lexical borrow scopes during inlining when the value passed for that argument is already lexical tests involving owned argument emission from SILGen and inlining need to be updated.
1 parent 69d1abe commit 6bb1826

26 files changed

+111
-90
lines changed

‎test/SILGen/async_builtins.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ public func usesWithUnsafeContinuationCaptures(fn: (Builtin.RawUnsafeContinuatio
117117
public func resumeNonThrowingContinuation(_ cont: Builtin.RawUnsafeContinuation,
118118
_ value: __owned String) {
119119
// CHECK: bb0(%0 : $Builtin.RawUnsafeContinuation, %1 : @owned $String):
120-
// CHECK: [[BORROW:%.*]] = begin_borrow [lexical] %1 : $String
121-
// CHECK-NEXT: debug_value
120+
// CHECK: debug_value
121+
// CHECK: [[BORROW:%.*]] = begin_borrow %1 : $String
122122
// CHECK-NEXT: [[COPY:%.*]] = copy_value [[BORROW]] : $String
123123
// CHECK-NEXT: builtin "resumeNonThrowingContinuationReturning"<String>(%0 : $Builtin.RawUnsafeContinuation, [[COPY]] : $String)
124124
// CHECK-NEXT: end_borrow [[BORROW]] : $String
@@ -130,8 +130,8 @@ public func resumeNonThrowingContinuation(_ cont: Builtin.RawUnsafeContinuation,
130130
public func resumeThrowingContinuation(_ cont: Builtin.RawUnsafeContinuation,
131131
_ value: __owned String) {
132132
// CHECK: bb0(%0 : $Builtin.RawUnsafeContinuation, %1 : @owned $String):
133-
// CHECK: [[BORROW:%.*]] = begin_borrow [lexical] %1 : $String
134-
// CHECK-NEXT: debug_value
133+
// CHECK: debug_value
134+
// CHECK: [[BORROW:%.*]] = begin_borrow %1 : $String
135135
// CHECK-NEXT: [[COPY:%.*]] = copy_value [[BORROW]] : $String
136136
// CHECK-NEXT: builtin "resumeThrowingContinuationReturning"<String>(%0 : $Builtin.RawUnsafeContinuation, [[COPY]] : $String)
137137
// CHECK-NEXT: end_borrow [[BORROW]] : $String
@@ -143,8 +143,8 @@ public func resumeThrowingContinuation(_ cont: Builtin.RawUnsafeContinuation,
143143
public func resumeThrowingContinuationThrowing(_ cont: Builtin.RawUnsafeContinuation,
144144
_ error: __owned Error) {
145145
// CHECK: bb0(%0 : $Builtin.RawUnsafeContinuation, %1 : @owned $any Error):
146-
// CHECK: [[BORROW:%.*]] = begin_borrow [lexical] %1 : $any Error
147-
// CHECK-NEXT: debug_value
146+
// CHECK: debug_value
147+
// CHECK: [[BORROW:%.*]] = begin_borrow %1 : $any Error
148148
// CHECK-NEXT: [[COPY:%.*]] = copy_value [[BORROW]] : $any Error
149149
// CHECK-NEXT: builtin "resumeThrowingContinuationThrowing"(%0 : $Builtin.RawUnsafeContinuation, [[COPY]] : $any Error)
150150
// CHECK-NEXT: end_borrow [[BORROW]] : $any Error

‎test/SILGen/builtins.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ func projectTailElems<T>(h: Header, ty: T.Type) -> Builtin.RawPointer {
365365
// CHECK-LABEL: sil hidden [ossa] @$s8builtins21projectTailElemsOwned{{[_0-9a-zA-Z]*}}F
366366
func projectTailElemsOwned<T>(h: __owned Header, ty: T.Type) -> Builtin.RawPointer {
367367
// CHECK: bb0([[ARG1:%.*]] : @owned $Header
368-
// CHECK: [[BORROWED_ARG1:%.*]] = begin_borrow [lexical] [[ARG1]]
368+
// CHECK: [[BORROWED_ARG1:%.*]] = begin_borrow [[ARG1]]
369369
// CHECK: [[TA:%.*]] = ref_tail_addr [[BORROWED_ARG1]] : $Header
370370
// -- Once we have passed the address through a2p, we no longer provide any guarantees.
371371
// -- We still need to make sure that the a2p itself is in the borrow site though.

‎test/SILGen/foreign_errors.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,10 @@ class VeryErrorProne : ErrorProne {
190190
// CHECK: [[MARKED_BOX:%.*]] = mark_uninitialized [derivedself] [[BOX]]
191191
// CHECK: [[LIFETIME:%.*]] = begin_borrow [lexical] [[MARKED_BOX]]
192192
// CHECK: [[PB:%.*]] = project_box [[LIFETIME]]
193-
// CHECK: [[BORROWED_ARG1:%.*]] = begin_borrow [lexical] [[ARG1]]
194193
// CHECK: store [[ARG2]] to [init] [[PB]]
195194
// CHECK: [[T0:%.*]] = load [take] [[PB]]
196195
// CHECK-NEXT: [[T1:%.*]] = upcast [[T0]] : $VeryErrorProne to $ErrorProne
196+
// CHECK: [[BORROWED_ARG1:%.*]] = begin_borrow [[ARG1]]
197197
// CHECK: [[ARG1_COPY:%.*]] = copy_value [[BORROWED_ARG1]]
198198
// CHECK-NOT: [[BOX]]{{^[0-9]}}
199199
// CHECK-NOT: [[PB]]{{^[0-9]}}

‎test/SILGen/function_conversion_objc.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func funcToBlock(_ x: @escaping () -> ()) -> @convention(block) () -> () {
5959
// CHECK-LABEL: sil hidden [ossa] @$s24function_conversion_objc11blockToFuncyyycyyXBF : $@convention(thin) (@guaranteed @convention(block) () -> ()) -> @owned @callee_guaranteed () -> ()
6060
// CHECK: bb0([[ARG:%.*]] : @guaranteed $@convention(block) () -> ()):
6161
// CHECK: [[COPIED:%.*]] = copy_block [[ARG]]
62-
// CHECK: [[BORROWED_COPIED:%.*]] = begin_borrow [lexical] [[COPIED]]
62+
// CHECK: [[BORROWED_COPIED:%.*]] = begin_borrow [[COPIED]]
6363
// CHECK: [[COPIED_2:%.*]] = copy_value [[BORROWED_COPIED]]
6464
// CHECK: [[THUNK:%.*]] = function_ref @$sIeyB_Ieg_TR
6565
// CHECK: [[FUNC:%.*]] = partial_apply [callee_guaranteed] [[THUNK]]([[COPIED_2]])

‎test/SILGen/guaranteed_normal_args.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ struct StructContainingBridgeObject {
148148

149149
// CHECK-LABEL: sil hidden [ossa] @$ss28StructContainingBridgeObjectV8swiftObjAByXl_tcfC : $@convention(method) (@owned AnyObject, @thin StructContainingBridgeObject.Type) -> @owned StructContainingBridgeObject {
150150
// CHECK: bb0([[ARG:%.*]] : @owned $AnyObject,
151-
// CHECK: [[BORROWED_ARG:%.*]] = begin_borrow [lexical] [[ARG]]
151+
// CHECK: [[BORROWED_ARG:%.*]] = begin_borrow [[ARG]]
152152
// CHECK: [[COPIED_ARG:%.*]] = copy_value [[BORROWED_ARG]]
153153
// CHECK: [[CASTED_ARG:%.*]] = unchecked_ref_cast [[COPIED_ARG]] : $AnyObject to $Builtin.BridgeObject
154154
// CHECK: assign [[CASTED_ARG]] to

‎test/SILGen/initializers.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1296,8 +1296,8 @@ class SubVariadic : SuperVariadic { }
12961296

12971297
// CHECK-LABEL: sil hidden [ossa] @$s21failable_initializers11SubVariadicC4intsACSid_tcfc
12981298
// CHECK: bb0(%0 : @owned $Array<Int>, %1 : @owned $SubVariadic):
1299-
// CHECK: [[T0:%.*]] = begin_borrow [lexical] %0 : $Array<Int>
13001299
// CHECK: [[SELF_UPCAST:%.*]] = upcast {{.*}} : $SubVariadic to $SuperVariadic
1300+
// CHECK: [[T0:%.*]] = begin_borrow %0 : $Array<Int>
13011301
// CHECK: [[T1:%.*]] = copy_value [[T0]] : $Array<Int>
13021302
// CHECK: [[SUPER_INIT:%.*]] = function_ref @$s21failable_initializers13SuperVariadicC4intsACSid_tcfc
13031303
// CHECK: apply [[SUPER_INIT]]([[T1]], [[SELF_UPCAST]])

‎test/SILGen/lexical_lifetime.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ func lexical_borrow_let_class_in_enum() {
8888

8989
// CHECK-LABEL: sil hidden [ossa] @lexical_borrow_arg_owned_class : $@convention(thin) (@owned C) -> () {
9090
// CHECK: {{bb[^,]+}}([[INSTANCE:%[^,]+]] : @owned $C):
91-
// CHECK: [[LIFETIME:%[^,]+]] = begin_borrow [lexical] [[INSTANCE]]
92-
// CHECK: debug_value [[LIFETIME]]
91+
// CHECK: debug_value [[INSTANCE]]
92+
// CHECK: [[LIFETIME:%[^,]+]] = begin_borrow [[INSTANCE]]
9393
// CHECK: [[ADDR:%[^,]+]] = alloc_stack $C
9494
// CHECK: [[SB:%.*]] = store_borrow [[LIFETIME]] to [[ADDR]]
9595
// CHECK: [[USE_GENERIC:%[^,]+]] = function_ref @use_generic

‎test/SILGen/modify_accessor.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ class SetterSynthesisFromModify {
6161
var modifiable: String {
6262
get { return stored }
6363
// CHECK: sil hidden [transparent] [ossa] @$s15modify_accessor25SetterSynthesisFromModifyC10modifiableSSvs
64-
// CHECK: [[VALUE_BORROW:%.*]] = begin_borrow [lexical] %0 : $String
65-
// CHECK-NEXT: debug_value
64+
// CHECK: debug_value
6665
// CHECK-NEXT: debug_value
66+
// CHECK-NEXT: [[VALUE_BORROW:%.*]] = begin_borrow %0 : $String
6767
// CHECK-NEXT: [[VALUE:%.*]] = copy_value [[VALUE_BORROW]] : $String
6868
// CHECK-NEXT: // function_ref
6969
// CHECK-NEXT: [[MODIFYFN:%.*]] = function_ref @$s15modify_accessor25SetterSynthesisFromModifyC10modifiableSSvM

‎test/SILGen/newtype.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ import Newtype
1010
// CHECK-CANONICAL-LABEL: sil hidden @$s7newtype17createErrorDomain{{[_0-9a-zA-Z]*}}F
1111
// CHECK-CANONICAL: bb0([[STR:%[0-9]+]] : $String)
1212
func createErrorDomain(str: String) -> ErrorDomain {
13+
// CHECK-CANONICAL: [[MOVED_STR:%[^,]+]] = move_value [lexical] [[STR]]
1314
// CHECK-CANONICAL: [[BRIDGE_FN:%[0-9]+]] = function_ref @{{.*}}_bridgeToObjectiveC
14-
// CHECK-CANONICAL-NEXT: [[BRIDGED:%[0-9]+]] = apply [[BRIDGE_FN]]([[STR]])
15+
// CHECK-CANONICAL-NEXT: [[BRIDGED:%[0-9]+]] = apply [[BRIDGE_FN]]([[MOVED_STR]])
1516
// CHECK-CANONICAL: struct $ErrorDomain ([[BRIDGED]] : $NSString)
1617
return ErrorDomain(rawValue: str)
1718
}
@@ -22,7 +23,7 @@ func createErrorDomain(str: String) -> ErrorDomain {
2223
// CHECK-RAW: [[MARKED_SELF_BOX:%[0-9]+]] = mark_uninitialized [rootself] [[SELF_BOX]]
2324
// CHECK-RAW: [[SELF_BOX_LIFETIME:%[0-9]+]] = begin_borrow [lexical] [[MARKED_SELF_BOX]]
2425
// CHECK-RAW: [[PB_BOX:%[0-9]+]] = project_box [[SELF_BOX_LIFETIME]]
25-
// CHECK-RAW: [[BORROWED_STR:%.*]] = begin_borrow [lexical] [[STR]]
26+
// CHECK-RAW: [[BORROWED_STR:%.*]] = begin_borrow [[STR]]
2627
// CHECK-RAW: [[COPIED_STR:%.*]] = copy_value [[BORROWED_STR]]
2728
// CHECK-RAW: [[BRIDGE_FN:%[0-9]+]] = function_ref @{{.*}}_bridgeToObjectiveC
2829
// CHECK-RAW: [[BORROWED_COPIED_STR:%.*]] = begin_borrow [[COPIED_STR]]

‎test/SILGen/objc_access_notes.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ class Hoozit : Gizmo {
179179

180180
// CHECK-LABEL: sil hidden [ossa] @$s11objc_thunks6HoozitC15typicalPropertySo5GizmoCvs
181181
// CHECK: bb0([[ARG0:%.*]] : @owned $Gizmo, [[ARG1:%.*]] : @guaranteed $Hoozit):
182-
// CHECK: [[BORROWED_ARG0:%.*]] = begin_borrow [lexical] [[ARG0]]
182+
// CHECK: [[BORROWED_ARG0:%.*]] = begin_borrow [[ARG0]]
183183
// CHECK: [[ARG0_COPY:%.*]] = copy_value [[BORROWED_ARG0]]
184184
// CHECK: [[ADDR:%.*]] = ref_element_addr [[ARG1]] : {{.*}}, #Hoozit.typicalProperty
185185
// CHECK: [[WRITE:%.*]] = begin_access [modify] [dynamic] [[ADDR]] : $*Gizmo
@@ -229,7 +229,7 @@ class Hoozit : Gizmo {
229229

230230
// CHECK-LABEL: sil hidden [ossa] @$s11objc_thunks6HoozitC12copyPropertySo5GizmoCvs
231231
// CHECK: bb0([[ARG1:%.*]] : @owned $Gizmo, [[SELF:%.*]] : @guaranteed $Hoozit):
232-
// CHECK: [[BORROWED_ARG1:%.*]] = begin_borrow [lexical] [[ARG1]]
232+
// CHECK: [[BORROWED_ARG1:%.*]] = begin_borrow [[ARG1]]
233233
// CHECK: [[ARG1_COPY:%.*]] = copy_value [[BORROWED_ARG1]]
234234
// CHECK: [[ADDR:%.*]] = ref_element_addr [[SELF]] : {{.*}}, #Hoozit.copyProperty
235235
// CHECK: [[WRITE:%.*]] = begin_access [modify] [dynamic] [[ADDR]] : $*Gizmo

‎test/SILGen/objc_bridging.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ class Bas : NSObject {
464464
func applyStringBlock(_ f: @convention(block) (String) -> String, x: String) -> String {
465465
// CHECK: bb0([[BLOCK:%.*]] : @guaranteed $@convention(block) @noescape (NSString) -> @autoreleased NSString, [[STRING:%.*]] : @guaranteed $String):
466466
// CHECK: [[BLOCK_COPY:%.*]] = copy_block [[BLOCK]]
467-
// CHECK: [[BORROWED_BLOCK_COPY:%.*]] = begin_borrow [lexical] [[BLOCK_COPY]]
467+
// CHECK: [[BORROWED_BLOCK_COPY:%.*]] = begin_borrow [[BLOCK_COPY]]
468468
// CHECK: [[BLOCK_COPY_COPY:%.*]] = copy_value [[BORROWED_BLOCK_COPY]]
469469
// CHECK: [[STRING_COPY:%.*]] = copy_value [[STRING]]
470470
// CHECK: [[STRING_TO_NSSTRING:%.*]] = function_ref @$sSS10FoundationE19_bridgeToObjectiveCSo8NSStringCyF

‎test/SILGen/objc_bridging_peephole.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -579,15 +579,15 @@ func testOptionalToNonOptionalBridge() {
579579

580580
// CHECK-LABEL: sil hidden [ossa] @$s22objc_bridging_peephole34testBlockToOptionalAnyObjectBridge5blockyyyXB_tF
581581
func testBlockToOptionalAnyObjectBridge(block: @escaping @convention(block) () -> ()) {
582-
// CHECK: [[T0:%.*]] = begin_borrow [lexical] {{%.*}} : $@convention(block) () -> ()
583-
// CHECK-NEXT: debug_value
582+
// CHECK: debug_value
583+
// CHECK-NEXT: [[T0:%.*]] = begin_borrow {{%.*}} : $@convention(block) () -> ()
584584
// CHECK-NEXT: [[T1:%.*]] = copy_value [[T0]]
585585
// CHECK-NEXT: [[REF:%.*]] = unchecked_ref_cast [[T1]] : $@convention(block) () -> () to $AnyObject
586586
// CHECK-NEXT: [[OPTREF:%.*]] = enum $Optional<AnyObject>, #Optional.some!enumelt, [[REF]] : $AnyObject
587+
// CHECK-NEXT: end_borrow [[T0]]
587588
// CHECK-NEXT: // function_ref
588589
// CHECK-NEXT: [[FN:%.*]] = function_ref @takeNullableId : $@convention(c) (Optional<AnyObject>) -> ()
589590
// CHECK-NEXT: apply [[FN]]([[OPTREF]])
590591
// CHECK-NEXT: destroy_value [[OPTREF]]
591-
// CHECK-NEXT: end_borrow [[T0]]
592592
takeNullableId(block as Any)
593593
}

‎test/SILGen/objc_extensions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ extension Sub {
6464

6565
// First we get the old value.
6666
// CHECK: bb0([[NEW_VALUE:%.*]] : @owned $Optional<String>, [[SELF:%.*]] : @guaranteed $Sub):
67-
// CHECK: [[BORROWED_NEW_VALUE:%.*]] = begin_borrow [lexical] [[NEW_VALUE]]
6867
// CHECK: [[SELF_COPY:%.*]] = copy_value [[SELF]]
6968
// CHECK: [[UPCAST_SELF_COPY:%.*]] = upcast [[SELF_COPY]] : $Sub to $Base
7069
// CHECK: [[BORROWED_UPCAST_SELF_COPY:%.*]] = begin_borrow [[UPCAST_SELF_COPY]]
@@ -78,6 +77,7 @@ extension Sub {
7877
// CHECK: destroy_value [[UPCAST_SELF_COPY]]
7978
// CHECK: [[SELF_COPY:%.*]] = copy_value [[SELF]]
8079
// CHECK: [[UPCAST_SELF_COPY:%.*]] = upcast [[SELF_COPY]] : $Sub to $Base
80+
// CHECK: [[BORROWED_NEW_VALUE:%.*]] = begin_borrow [[NEW_VALUE]]
8181
// CHECK: [[NEW_VALUE_COPY:%.*]] = copy_value [[BORROWED_NEW_VALUE]]
8282
// CHECK: switch_enum [[NEW_VALUE_COPY]] : $Optional<String>, case #Optional.some!enumelt: [[SOME_BB:bb[0-9]+]], case #Optional.none!enumelt: [[NONE_BB:bb[0-9]+]]
8383
//

‎test/SILGen/objc_factory_init.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ extension Hive {
2727
// CHECK: [[MU:%.*]] = mark_uninitialized [delegatingself] [[SELF_BOX]]
2828
// CHECK: [[LIFETIME:%[^,]+]] = begin_borrow [lexical] [[MU]]
2929
// CHECK: [[PB_BOX:%.*]] = project_box [[LIFETIME]] : ${ var Hive }, 0
30-
// CHECK: [[BORROWED_QUEEN:%.*]] = begin_borrow [lexical] [[QUEEN]]
3130
// CHECK: [[OBJC_META:%[0-9]+]] = thick_to_objc_metatype [[META]] : $@thick Hive.Type to $@objc_metatype Hive.Type
31+
// CHECK: [[BORROWED_QUEEN:%.*]] = begin_borrow [[QUEEN]]
3232
// CHECK: [[COPIED_BORROWED_QUEEN:%.*]] = copy_value [[BORROWED_QUEEN]]
3333
// CHECK: [[OPT_COPIED_BORROWED_QUEEN:%.*]] = enum $Optional<Bee>, #Optional.some!enumelt, [[COPIED_BORROWED_QUEEN]]
3434
// CHECK: [[FACTORY:%[0-9]+]] = objc_method [[OBJC_META]] : $@objc_metatype Hive.Type, #Hive.init!allocator.foreign : (Hive.Type) -> (Bee?) -> Hive?, $@convention(objc_method) (Optional<Bee>, @objc_metatype Hive.Type) -> @autoreleased Optional<Hive>
@@ -49,9 +49,9 @@ extension Hive {
4949
// CHECK-NEXT: [[MU:%.*]] = mark_uninitialized [delegatingself] [[SELF_BOX]]
5050
// CHECK-NEXT: [[LIFETIME:%[^,]+]] = begin_borrow [lexical] [[MU]]
5151
// CHECK-NEXT: [[PB_BOX:%.*]] = project_box [[LIFETIME]] : ${ var Hive }, 0
52-
// CHECK-NEXT: [[BORROWED_QUEEN:%.*]] = begin_borrow [lexical] [[QUEEN]]
5352
// CHECK: [[FOREIGN_ERROR_STACK:%.*]] = alloc_stack [dynamic_lifetime] $Optional<NSError>
5453
// CHECK: [[OBJC_META:%[0-9]+]] = thick_to_objc_metatype [[META]] : $@thick Hive.Type to $@objc_metatype Hive.Type
54+
// CHECK: [[BORROWED_QUEEN:%.*]] = begin_borrow [[QUEEN]]
5555
// CHECK: [[COPIED_BORROWED_QUEEN:%.*]] = copy_value [[BORROWED_QUEEN]]
5656
// CHECK: [[OPT_COPIED_BORROWED_QUEEN:%.*]] = enum $Optional<Bee>, #Optional.some!enumelt, [[COPIED_BORROWED_QUEEN]]
5757
// CHECK: [[FACTORY:%[0-9]+]] = objc_method [[OBJC_META]] : $@objc_metatype Hive.Type, #Hive.init!allocator.foreign : (Hive.Type) -> (Bee?) throws -> Hive, $@convention(objc_method) (Optional<Bee>, Optional<AutoreleasingUnsafeMutablePointer<Optional<NSError>>>, @objc_metatype Hive.Type) -> @autoreleased Optional<Hive>

‎test/SILGen/objc_ownership_conventions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ func test11(_ g: Gizmo) -> AnyClass {
178178
func applyBlock(_ f: @convention(block) (Gizmo) -> Gizmo, x: Gizmo) -> Gizmo {
179179
// CHECK: bb0([[BLOCK:%.*]] : @guaranteed $@convention(block) @noescape (Gizmo) -> @autoreleased Gizmo, [[ARG:%.*]] : @guaranteed $Gizmo):
180180
// CHECK: [[BLOCK_COPY:%.*]] = copy_block [[BLOCK]]
181-
// CHECK: [[BORROWED_BLOCK_COPY:%.*]] = begin_borrow [lexical] [[BLOCK_COPY]]
181+
// CHECK: [[BORROWED_BLOCK_COPY:%.*]] = begin_borrow [[BLOCK_COPY]]
182182
// CHECK: [[BLOCK_COPY_COPY:%.*]] = copy_value [[BORROWED_BLOCK_COPY]]
183183
// CHECK: [[RESULT:%.*]] = apply [[BLOCK_COPY_COPY]]([[ARG]])
184184
// CHECK: destroy_value [[BLOCK_COPY_COPY]]

‎test/SILGen/objc_properties.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class B : A {
105105
class TestNSCopying {
106106
// CHECK-LABEL: sil hidden [transparent] [ossa] @$s15objc_properties13TestNSCopyingC8propertySo8NSStringCvs : $@convention(method) (@owned NSString, @guaranteed TestNSCopying) -> ()
107107
// CHECK: bb0([[ARG0:%.*]] : @owned $NSString, [[ARG1:%.*]] : @guaranteed $TestNSCopying):
108-
// CHECK: [[BORROWED_ARG0:%.*]] = begin_borrow [lexical] [[ARG0]]
108+
// CHECK: [[BORROWED_ARG0:%.*]] = begin_borrow [[ARG0]]
109109
// CHECK: objc_method [[BORROWED_ARG0]] : $NSString, #NSCopying.copy!foreign
110110
@NSCopying var property : NSString
111111

‎test/SILGen/objc_thunks.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ class Hoozit : Gizmo {
163163

164164
// CHECK-LABEL: sil hidden [ossa] @$s11objc_thunks6HoozitC15typicalPropertySo5GizmoCvs
165165
// CHECK: bb0([[ARG0:%.*]] : @owned $Gizmo, [[ARG1:%.*]] : @guaranteed $Hoozit):
166-
// CHECK: [[BORROWED_ARG0:%.*]] = begin_borrow [lexical] [[ARG0]]
166+
// CHECK: [[BORROWED_ARG0:%.*]] = begin_borrow [[ARG0]]
167167
// CHECK: [[ARG0_COPY:%.*]] = copy_value [[BORROWED_ARG0]]
168168
// CHECK: [[ADDR:%.*]] = ref_element_addr [[ARG1]] : {{.*}}, #Hoozit.typicalProperty
169169
// CHECK: [[WRITE:%.*]] = begin_access [modify] [dynamic] [[ADDR]] : $*Gizmo
@@ -211,7 +211,7 @@ class Hoozit : Gizmo {
211211

212212
// CHECK-LABEL: sil hidden [ossa] @$s11objc_thunks6HoozitC12copyPropertySo5GizmoCvs
213213
// CHECK: bb0([[ARG1:%.*]] : @owned $Gizmo, [[SELF:%.*]] : @guaranteed $Hoozit):
214-
// CHECK: [[BORROWED_ARG1:%.*]] = begin_borrow [lexical] [[ARG1]]
214+
// CHECK: [[BORROWED_ARG1:%.*]] = begin_borrow [[ARG1]]
215215
// CHECK: [[ARG1_COPY:%.*]] = copy_value [[BORROWED_ARG1]]
216216
// CHECK: [[ADDR:%.*]] = ref_element_addr [[SELF]] : {{.*}}, #Hoozit.copyProperty
217217
// CHECK: [[WRITE:%.*]] = begin_access [modify] [dynamic] [[ADDR]] : $*Gizmo

‎test/SILGen/property_wrapper_parameter.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ struct TestStructInit {
105105
// CHECK-LABEL: sil hidden [ossa] @$s26property_wrapper_parameter14TestStructInitV6number7messageAcA7WrapperVySiG_SStcfC : $@convention(method) (Wrapper<Int>, @owned String, @thin TestStructInit.Type) -> TestStructInit
106106
init(@Wrapper number: Int, @ImplementationDetail message: String) {
107107
// CHECK: debug_value %0 : $Wrapper<Int>, let, name "_number"
108-
// CHECK: [[STR:%.*]] = begin_borrow [lexical] %1
109-
// CHECK: debug_value [[STR]] : $String, let, name "message"
108+
// CHECK: debug_value [[STR:%.*]] : $String, let, name "message"
110109
// CHECK: alloc_stack $ImplementationDetail<String>
110+
// CHECK: begin_borrow [[STR]]
111111
// CHECK" function_ref @$s26property_wrapper_parameter20ImplementationDetailV12wrappedValueACyxGx_tcfC : $@convention(method) <τ_0_0> (@in τ_0_0, @thin ImplementationDetail<τ_0_0>.Type) -> @out ImplementationDetail<τ_0_0>
112112

113113
_ = number
@@ -138,9 +138,9 @@ class TestClassInit {
138138
// CHECK-LABEL: sil hidden [ossa] @$s26property_wrapper_parameter13TestClassInitC6number7messageAcA7WrapperVySiG_SStcfc : $@convention(method) (Wrapper<Int>, @owned String, @owned TestClassInit) -> @owned TestClassInit
139139
init(@Wrapper number: Int, @ImplementationDetail message: String) {
140140
// CHECK: debug_value %0 : $Wrapper<Int>, let, name "_number"
141-
// CHECK: [[STR:%.*]] = begin_borrow [lexical] %1
142-
// CHECK: debug_value [[STR]] : $String, let, name "message"
141+
// CHECK: debug_value [[STR:%.*]] : $String, let, name "message"
143142
// CHECK: alloc_stack $ImplementationDetail<String>
143+
// CHECK: begin_borrow [[STR]]
144144

145145
_ = number
146146
_ = _number

0 commit comments

Comments
 (0)