Skip to content

Commit f2dce0f

Browse files
authored
Merge pull request #36255 from eeckstein/fix-tests
tests: cleanup for two ownership verifier tests.
2 parents acec216 + ebbbb6d commit f2dce0f

File tree

2 files changed

+3
-17
lines changed

2 files changed

+3
-17
lines changed

test/SIL/ownership-verifier/interior_pointer.sil

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -123,23 +123,6 @@ bb0(%0 : @owned $Builtin.NativeObject):
123123
return %9999 : $()
124124
}
125125

126-
// CHECK-LABEL: Error#: 0. Begin Error in Function: 'recursive_interior_pointer_error'
127-
// CHECK-NEXT: Found outside of lifetime use?!
128-
// CHECK-NEXT: Value: %2 = begin_borrow %0 : $KlassUser
129-
// CHECK-NEXT: Consuming User: end_borrow %2 : $KlassUser
130-
// CHECK-NEXT: Non Consuming User: %6 = load [copy] %3 : $*Klass
131-
// CHECK-NEXT: Block: bb0
132-
// CHECK: Error#: 0. End Error in Function: 'recursive_interior_pointer_error'
133-
sil [ossa] @recursive_interior_pointer_error : $@convention(thin) (@owned KlassUser, @guaranteed Klass) -> @owned Klass {
134-
bb0(%0 : @owned $KlassUser, %0a : @guaranteed $Klass):
135-
%1 = begin_borrow %0 : $KlassUser
136-
%2 = ref_tail_addr %1 : $KlassUser, $Klass
137-
end_borrow %1 : $KlassUser
138-
destroy_value %0 : $KlassUser
139-
%3 = load [copy] %2 : $*Klass
140-
return %3 : $Klass
141-
}
142-
143126
// CHECK-LABEL: Error#: 0. Begin Error in Function: 'open_existential_box_interior_pointer_error'
144127
// CHECK-NEXT: Found outside of lifetime use?!
145128
// CHECK-NEXT: Value: %1 = begin_borrow %0 : $Error // users: %3, %2

test/SIL/ownership-verifier/load_borrow_invalidation_partial_apply.sil

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ bb0(%0 : @owned $WrapperStruct):
5151
return %res : $()
5252
}
5353

54+
// Note: The MemoryLifetimeVerifier will also report an error for this function. Therefore
55+
// we run sil-opt with -dont-abort-on-memory-lifetime-error.
56+
5457
// CHECK-LABEL: Begin Error in function caller2
5558
// CHECK: SIL verification failed: Found load borrow that is invalidated by a local write?!: loadBorrowImmutabilityAnalysis.isImmutable(LBI)
5659
// CHECK-LABEL: End Error in function caller2

0 commit comments

Comments
 (0)