Skip to content

Commit 4f4167b

Browse files
committed
[SIL tests] Don’t intersperse declarations and SIL in ‘Swift’ module.
Doing this relies on type checker state getting wiped out in between SIL declarations, which is odd.
1 parent 7c10c61 commit 4f4167b

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

test/SIL/ownership-verifier/false_positive_leaks.sil

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ sil_stage canonical
1212

1313
import Builtin
1414

15-
sil @in_guaranteed_user : $@convention(thin) (@in_guaranteed Builtin.NativeObject) -> ()
1615
protocol Error {}
16+
17+
sil @in_guaranteed_user : $@convention(thin) (@in_guaranteed Builtin.NativeObject) -> ()
1718
sil @error_func : $@convention(thin) () -> (Builtin.Int32, @error Error)
1819
sil @allocate_object : $@convention(thin) () -> (@owned Builtin.NativeObject)
1920

test/SIL/ownership-verifier/use_verifier.sil

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ import Builtin
1313
// Declarations //
1414
//////////////////
1515

16-
sil @allocate_object : $@convention(thin) () -> @owned Builtin.NativeObject
17-
1816
typealias AnyObject = Builtin.AnyObject
1917

2018
public protocol Error {}
@@ -36,8 +34,6 @@ case trivial_payload(Builtin.Int32)
3634
case nontrivial_payload(Builtin.NativeObject)
3735
}
3836

39-
sil @three_differing_payload_enum_user : $@convention(thin) (@owned ThreeDifferingPayloadEnum, @guaranteed ThreeDifferingPayloadEnum, ThreeDifferingPayloadEnum) -> ()
40-
4137
struct TrivialStruct {
4238
var f1: Builtin.Int32
4339
var f2: Builtin.Int32
@@ -67,8 +63,6 @@ protocol SwiftKlassP : class {
6763
func foo()
6864
}
6965

70-
sil @nontrivial_unowned_user : $@convention(thin) (Builtin.NativeObject) -> ()
71-
7266
struct Val {
7367
}
7468
class Ref {
@@ -78,15 +72,10 @@ struct Aleph {
7872
var b:Val
7973
}
8074

81-
sil @borrow_tuple_user : $@convention(thin) (@guaranteed (Builtin.Int32, Builtin.NativeObject, Builtin.Int32, Builtin.NativeObject)) -> ()
82-
sil @unowned_tuple_user : $@convention(thin) ((Builtin.Int32, Builtin.NativeObject, Builtin.Int32, Builtin.NativeObject)) -> ()
83-
8475
struct Int {
8576
var value: Builtin.Int64
8677
}
8778

88-
sil @no_arg_or_output_function : $@convention(thin) () -> ()
89-
9079
class RefWithInt {
9180
var value: Builtin.Int32
9281

@@ -101,6 +90,18 @@ class RefWithRef {
10190
init()
10291
}
10392

93+
sil @no_arg_or_output_function : $@convention(thin) () -> ()
94+
95+
96+
sil @allocate_object : $@convention(thin) () -> @owned Builtin.NativeObject
97+
98+
sil @three_differing_payload_enum_user : $@convention(thin) (@owned ThreeDifferingPayloadEnum, @guaranteed ThreeDifferingPayloadEnum, ThreeDifferingPayloadEnum) -> ()
99+
100+
sil @nontrivial_unowned_user : $@convention(thin) (Builtin.NativeObject) -> ()
101+
102+
sil @borrow_tuple_user : $@convention(thin) (@guaranteed (Builtin.Int32, Builtin.NativeObject, Builtin.Int32, Builtin.NativeObject)) -> ()
103+
sil @unowned_tuple_user : $@convention(thin) ((Builtin.Int32, Builtin.NativeObject, Builtin.Int32, Builtin.NativeObject)) -> ()
104+
104105
sil @produce_owned_optional : $@convention(thin) () -> @owned Optional<Builtin.NativeObject>
105106
sil @guaranteed_nativeobject_user : $@convention(thin) (@guaranteed Builtin.NativeObject) -> ()
106107

0 commit comments

Comments
 (0)