Skip to content

Commit fc71233

Browse files
meg-guptameg-gupta
committed
[NFC] Update tests
1 parent bef2075 commit fc71233

File tree

3 files changed

+22
-31
lines changed

3 files changed

+22
-31
lines changed

‎test/SILGen/borrow_accessor.swift‎

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -491,10 +491,9 @@ public struct GenNCWrapper<T : ~Copyable> : ~Copyable {
491491
// CHECK: debug_value [[REG0]], let, name "self", argno 1, expr op_deref
492492
// CHECK: [[REG2:%.*]] = struct_element_addr [[REG0]], #GenWrapper._s
493493
// CHECK: [[REG3:%.*]] = load_borrow [[REG2]]
494-
// CHECK: [[REG4:%.*]] = unchecked_ownership_conversion [[REG3]], @guaranteed to @unowned
495-
// CHECK: [[REG5:%.*]] = unchecked_ownership_conversion [[REG4]], @unowned to @guaranteed
494+
// CHECK: [[REG4:%.*]] = unchecked_ownership [[REG3]]
496495
// CHECK: end_borrow [[REG3]]
497-
// CHECK: return [[REG5]]
496+
// CHECK: return [[REG4]]
498497
// CHECK: }
499498

500499
// CHECK: sil hidden [ossa] @$s15borrow_accessor10GenWrapperV1sAA1SVvz : $@convention(method) <T> (@inout GenWrapper<T>) -> @inout S {
@@ -509,10 +508,9 @@ public struct GenNCWrapper<T : ~Copyable> : ~Copyable {
509508
// CHECK: debug_value [[REG0]], let, name "self", argno 1, expr op_deref
510509
// CHECK: [[REG2:%.*]] = struct_element_addr [[REG0]], #GenWrapper._k
511510
// CHECK: [[REG3:%.*]] = load_borrow [[REG2]]
512-
// CHECK: [[REG4:%.*]] = unchecked_ownership_conversion [[REG3]], @guaranteed to @unowned
513-
// CHECK: [[REG5:%.*]] = unchecked_ownership_conversion [[REG4]], @unowned to @guaranteed
511+
// CHECK: [[REG4:%.*]] = unchecked_ownership [[REG3]]
514512
// CHECK: end_borrow [[REG3]]
515-
// CHECK: return [[REG5]]
513+
// CHECK: return [[REG4]]
516514
// CHECK: }
517515

518516
// CHECK: sil hidden [ossa] @$s15borrow_accessor10GenWrapperV1kAA5KlassCvz : $@convention(method) <T> (@inout GenWrapper<T>) -> @inout Klass {
@@ -555,10 +553,9 @@ public struct GenNCWrapper<T : ~Copyable> : ~Copyable {
555553
// CHECK: [[REG3:%.*]] = load_borrow [[REG2]]
556554
// CHECK: [[REG4:%.*]] = function_ref @$s15borrow_accessor1SV1kAA5KlassCvb : $@convention(method) (@guaranteed S) -> @guaranteed Klass
557555
// CHECK: [[REG5:%.*]] = apply [[REG4]]([[REG3]]) : $@convention(method) (@guaranteed S) -> @guaranteed Klass
558-
// CHECK: [[REG6:%.*]] = unchecked_ownership_conversion [[REG5]], @guaranteed to @unowned
559-
// CHECK: [[REG7:%.*]] = unchecked_ownership_conversion [[REG6]], @unowned to @guaranteed
556+
// CHECK: [[REG6:%.*]] = unchecked_ownership [[REG5]]
560557
// CHECK: end_borrow [[REG3]]
561-
// CHECK: return [[REG7]]
558+
// CHECK: return [[REG6]]
562559
// CHECK: }
563560

564561
// CHECK: sil hidden [ossa] @$s15borrow_accessor10GenWrapperV9nested_k1AA5KlassCvz : $@convention(method) <T> (@inout GenWrapper<T>) -> @inout Klass {
@@ -652,10 +649,9 @@ public struct GenNCWrapper<T : ~Copyable> : ~Copyable {
652649
// CHECK: [[REG2:%.*]] = mark_unresolved_non_copyable_value [no_consume_or_assign] [[REG0]]
653650
// CHECK: [[REG3:%.*]] = struct_element_addr [[REG2]], #GenNCWrapper._nc
654651
// CHECK: [[REG4:%.*]] = load_borrow [[REG3]]
655-
// CHECK: [[REG5:%.*]] = unchecked_ownership_conversion [[REG4]], @guaranteed to @unowned
656-
// CHECK: [[REG6:%.*]] = unchecked_ownership_conversion [[REG5]], @unowned to @guaranteed
652+
// CHECK: [[REG5:%.*]] = unchecked_ownership [[REG4]]
657653
// CHECK: end_borrow [[REG4]]
658-
// CHECK: return [[REG6]]
654+
// CHECK: return [[REG5]]
659655
// CHECK: }
660656

661657
// CHECK: sil hidden [ossa] @$s15borrow_accessor12GenNCWrapperVAARi_zrlE2ncAA2NCVvz : $@convention(method) <T where T : ~Copyable> (@inout GenNCWrapper<T>) -> @inout NC {
@@ -672,10 +668,9 @@ public struct GenNCWrapper<T : ~Copyable> : ~Copyable {
672668
// CHECK: [[REG2:%.*]] = mark_unresolved_non_copyable_value [no_consume_or_assign] [[REG0]]
673669
// CHECK: [[REG3:%.*]] = struct_element_addr [[REG2]], #GenNCWrapper._ncw
674670
// CHECK: [[REG4:%.*]] = load_borrow [[REG3]]
675-
// CHECK: [[REG5:%.*]] = unchecked_ownership_conversion [[REG4]], @guaranteed to @unowned
676-
// CHECK: [[REG6:%.*]] = unchecked_ownership_conversion [[REG5]], @unowned to @guaranteed
671+
// CHECK: [[REG5:%.*]] = unchecked_ownership [[REG4]]
677672
// CHECK: end_borrow [[REG4]]
678-
// CHECK: return [[REG6]]
673+
// CHECK: return [[REG5]]
679674
// CHECK: }
680675

681676
// CHECK: sil hidden [ossa] @$s15borrow_accessor12GenNCWrapperVAARi_zrlE3ncwAA0D0Vvz : $@convention(method) <T where T : ~Copyable> (@inout GenNCWrapper<T>) -> @inout NCWrapper {
@@ -736,15 +731,14 @@ public struct GenNCWrapper<T : ~Copyable> : ~Copyable {
736731
// CHECK: [[REG4:%.*]] = load_borrow [[REG3]]
737732
// CHECK: [[REG5:%.*]] = function_ref @$s15borrow_accessor9NCWrapperV2ncAA2NCVvb : $@convention(method) (@guaranteed NCWrapper) -> @guaranteed NC
738733
// CHECK: [[REG6:%.*]] = apply [[REG5]]([[REG4]]) : $@convention(method) (@guaranteed NCWrapper) -> @guaranteed NC
739-
// CHECK: [[REG7:%.*]] = unchecked_ownership_conversion [[REG6]], @guaranteed to @unowned
740-
// CHECK: [[REG8:%.*]] = unchecked_ownership_conversion [[REG7]], @unowned to @guaranteed
741-
// CHECK: [[REG9:%.*]] = copy_value [[REG8]]
734+
// CHECK: [[REG7:%.*]] = unchecked_ownership [[REG6]]
735+
// CHECK: [[REG9:%.*]] = copy_value [[REG7]]
742736
// CHECK: [[REG10:%.*]] = mark_unresolved_non_copyable_value [no_consume_or_assign] [[REG9]]
743737
// CHECK: [[REG11:%.*]] = begin_borrow [[REG10]]
744738
// CHECK: end_borrow [[REG4]]
745739
// CHECK: end_borrow [[REG11]]
746740
// CHECK: destroy_value [[REG10]]
747-
// CHECK: return [[REG8]]
741+
// CHECK: return [[REG7]]
748742
// CHECK: }
749743

750744
// CHECK: sil hidden [ossa] @$s15borrow_accessor12GenNCWrapperVAARi_zrlE10nested_nc1AA2NCVvz : $@convention(method) <T where T : ~Copyable> (@inout GenNCWrapper<T>) -> @inout NC {

‎test/SILGen/borrow_accessor_container.swift‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,11 @@ public struct CopyableContainer {
224224
// CHECK: [[REG27:%.*]] = begin_access [read] [unsafe] [[REG26]]
225225
// CHECK: [[REG28:%.*]] = struct_element_addr [[REG27]], #S._k
226226
// CHECK: [[REG29:%.*]] = load_borrow [[REG28]]
227-
// CHECK: [[REG31:%.*]] = unchecked_ownership_conversion [[REG29]], @guaranteed to @unowned
228-
// CHECK: [[REG32:%.*]] = unchecked_ownership_conversion [[REG31]], @unowned to @guaranteed
227+
// CHECK: [[REG31:%.*]] = unchecked_ownership [[REG29]]
229228
// CHECK: end_access [[REG27]]
230229
// CHECK: end_borrow [[REG29]]
231230
// CHECK: dealloc_stack [[REG4]]
232-
// CHECK: return [[REG32]]
231+
// CHECK: return [[REG31]]
233232
// CHECK: }
234233

235234
// CHECK: sil [ossa] @$s25borrow_accessor_container17CopyableContainerVyAA5KlassCSiciz : $@convention(method) (Int, @inout CopyableContainer) -> @inout Klass {
@@ -329,13 +328,12 @@ public struct NonCopyableContainer : ~Copyable {
329328
// CHECK: [[REG31:%.*]] = begin_access [read] [unsafe] [[REG30]]
330329
// CHECK: [[REG32:%.*]] = mark_unresolved_non_copyable_value [no_consume_or_assign] [[REG31]]
331330
// CHECK: [[REG33:%.*]] = load_borrow [[REG32]]
332-
// CHECK: [[REG35:%.*]] = unchecked_ownership_conversion [[REG33]], @guaranteed to @unowned
333-
// CHECK: [[REG36:%.*]] = unchecked_ownership_conversion [[REG35]], @unowned to @guaranteed
331+
// CHECK: [[REG35:%.*]] = unchecked_ownership [[REG33]]
334332
// CHECK: end_access [[REG31]]
335333
// CHECK: end_borrow [[REG33]]
336334
// CHECK: dealloc_stack [[REG6]]
337335
// CHECK: destroy_value [[REG4]]
338-
// CHECK: return [[REG36]]
336+
// CHECK: return [[REG35]]
339337
// CHECK: }
340338

341339
// CHECK: sil [ossa] @$s25borrow_accessor_container20NonCopyableContainerVyAA2NCVSiciz : $@convention(method) (Int, @inout NonCopyableContainer) -> @inout NC {

‎test/SILGen/borrow_accessor_evolution.swift‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ func test() {
131131
// CHECK: debug_value [[REG0]], let, name "self", argno 1, expr op_deref
132132
// CHECK: [[REG2:%.*]] = struct_element_addr [[REG0]], #Wrapper._k
133133
// CHECK: [[REG3:%.*]] = load_borrow [[REG2]]
134-
// CHECK: [[REG4:%.*]] = unchecked_ownership_conversion [[REG3]], @guaranteed to @unowned
135-
// CHECK: [[REG5:%.*]] = unchecked_ownership_conversion [[REG4]], @unowned to @guaranteed
136-
// CHECK: return [[REG5]]
134+
// CHECK: [[REG4:%.*]] = unchecked_ownership [[REG3]]
135+
// CHECK: end_borrow [[REG3]]
136+
// CHECK: return [[REG4]]
137137
// CHECK: }
138138

139139
// CHECK-LABEL: sil hidden [ossa] @$s25borrow_accessor_evolution7WrapperV7nested1AA5KlassCvb : $@convention(method) (@in_guaranteed Wrapper) -> @guaranteed Klass {
@@ -159,10 +159,9 @@ func test() {
159159
// CHECK: debug_value [[REG1]], let, name "self", argno 2, expr op_deref
160160
// CHECK: [[REG4:%.*]] = struct_element_addr [[REG1]], #Wrapper._k
161161
// CHECK: [[REG5:%.*]] = load_borrow [[REG4]]
162-
// CHECK: [[REG6:%.*]] = unchecked_ownership_conversion [[REG5]], @guaranteed to @unowned
163-
// CHECK: [[REG7:%.*]] = unchecked_ownership_conversion [[REG6]], @unowned to @guaranteed
162+
// CHECK: [[REG6:%.*]] = unchecked_ownership [[REG5]]
164163
// CHECK: end_borrow [[REG5]]
165-
// CHECK: return [[REG7]]
164+
// CHECK: return [[REG6]]
166165
// CHECK: }
167166

168167
// CHECK-LABEL: sil hidden [ossa] @$s25borrow_accessor_evolution7WrapperV16nested_subscriptAA5KlassCvb : $@convention(method) (@in_guaranteed Wrapper) -> @guaranteed Klass {

0 commit comments

Comments
 (0)