Skip to content

Commit b6b1b06

Browse files
committed
[rebranch][test] LLVMPasses, IRGen: Switch some remaining tests from nocapture to captures(none)
Per 29441e4f5fa5f5c7709f7cf180815ba97f611297 (llvm-project).
1 parent b7b60b7 commit b6b1b06

8 files changed

+14
-14
lines changed

test/IRGen/argument_attrs.sil

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ entry(%1 : $*Builtin.Int32, %2 : $*Builtin.Int32, %3 : $*Builtin.Int32, %4 : $Hu
1616
return undef : $()
1717
}
1818

19-
// CHECK-LABEL: declare{{( dllimport)?}} swiftcc void @arguments_in_decl(ptr captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(40), ptr noalias, ptr noalias nocapture, ptr)
19+
// CHECK-LABEL: declare{{( dllimport)?}} swiftcc void @arguments_in_decl(ptr captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(40), ptr noalias, ptr noalias captures(none), ptr)
2020
sil @arguments_in_decl : $@convention(thin) <T> (@inout Builtin.Int32, @in Builtin.Int32, @in_guaranteed Builtin.Int32, Huge, @in T, @in ()) -> ()
2121

2222
// CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @arguments_in_def_out(ptr noalias captures(none) sret({{.*}}) %0, ptr captures(none) dereferenceable(4) %1, ptr noalias captures(none) dereferenceable(4) %2, ptr noalias captures(none) dereferenceable(4) %3, ptr noalias captures(none) dereferenceable(40) %4, ptr noalias %5, ptr noalias captures(none) %6, ptr %T)
@@ -31,7 +31,7 @@ entry(%0 : $*Builtin.Int32, %1 : $*Builtin.Int32, %2 : $*Builtin.Int32, %3 : $*B
3131
return undef : $()
3232
}
3333

34-
// CHECK-LABEL: declare{{( dllimport)?}} swiftcc void @arguments_in_decl_out(ptr noalias captures(none) sret({{.*}}), ptr captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(40), ptr noalias, ptr noalias nocapture, ptr)
34+
// CHECK-LABEL: declare{{( dllimport)?}} swiftcc void @arguments_in_decl_out(ptr noalias captures(none) sret({{.*}}), ptr captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(40), ptr noalias, ptr noalias captures(none), ptr)
3535
sil @arguments_in_decl_out : $@convention(thin) <T> (@inout Builtin.Int32, @in Builtin.Int32, @in_guaranteed Builtin.Int32, Huge, @in T, @in ()) -> @out Builtin.Int32
3636

3737
// CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @arguments_in_def_huge_ret(ptr noalias captures(none) sret({{.*}}V) %0, ptr captures(none) dereferenceable(4) %1, ptr noalias captures(none) dereferenceable(4) %2, ptr noalias captures(none) dereferenceable(4) %3, ptr noalias captures(none) dereferenceable(40) %4, ptr noalias %5, ptr noalias captures(none) %6, ptr %T)
@@ -46,7 +46,7 @@ entry(%1 : $*Builtin.Int32, %2 : $*Builtin.Int32, %3 : $*Builtin.Int32, %4 : $Hu
4646
return %y : $Huge
4747
}
4848

49-
// CHECK-LABEL: declare{{( dllimport)?}} swiftcc void @arguments_in_decl_huge_ret(ptr noalias captures(none) sret({{.*}}), ptr captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(40), ptr noalias, ptr noalias nocapture, ptr)
49+
// CHECK-LABEL: declare{{( dllimport)?}} swiftcc void @arguments_in_decl_huge_ret(ptr noalias captures(none) sret({{.*}}), ptr captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(40), ptr noalias, ptr noalias captures(none), ptr)
5050
sil @arguments_in_decl_huge_ret : $@convention(thin) <T> (@inout Builtin.Int32, @in Builtin.Int32, @in_guaranteed Builtin.Int32, Huge, @in T, @in ()) -> Huge
5151

5252

test/LLVMPasses/allocation-deletion.ll

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ target triple = "x86_64-apple-macosx10.9"
77
%swift.heapmetadata = type { ptr, ptr }
88

99
declare ptr @swift_allocObject(ptr , i64, i64) nounwind
10-
declare void @swift_release(ptr nocapture)
10+
declare void @swift_release(ptr captures(none))
1111
declare void @swift_retain(ptr ) nounwind
1212
declare { i64, i64, i64 } @swift_retainAndReturnThree(ptr , i64, i64 , i64 )
1313

@@ -36,7 +36,7 @@ entry:
3636
; trivial_alloc_eliminate1 - Show that we can eliminate an allocation with a
3737
; trivial destructor.
3838
@trivial_dtor_metadata = internal constant %swift.heapmetadata { ptr @trivial_dtor, ptr null }
39-
define internal i64 @trivial_dtor(ptr nocapture) nounwind readonly {
39+
define internal i64 @trivial_dtor(ptr captures(none)) nounwind readonly {
4040
entry:
4141
%1 = getelementptr inbounds %swift.refcounted, ptr %0, i64 1
4242
%length = load i64, ptr %1, align 8

test/LLVMPasses/basic.ll

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ declare void @swift_unknownObjectRelease(ptr)
1616
declare ptr @llvm.objc.retain(ptr)
1717
declare void @llvm.objc.release(ptr)
1818
declare ptr @swift_allocObject(ptr , i64, i64) nounwind
19-
declare void @swift_release(ptr nocapture)
19+
declare void @swift_release(ptr captures(none))
2020
declare ptr @swift_retain(ptr returned) nounwind
2121
declare ptr @swift_bridgeObjectRetain(ptr)
2222
declare void @swift_bridgeObjectRelease(ptr)

test/LLVMPasses/contract.ll

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ target triple = "x86_64-apple-macosx10.9"
1010
declare ptr @swift_allocObject(ptr , i64, i64) nounwind
1111
declare ptr @swift_bridgeObjectRetain(ptr)
1212
declare void @swift_bridgeObjectRelease(ptr )
13-
declare void @swift_release(ptr nocapture)
13+
declare void @swift_release(ptr captures(none))
1414
declare ptr @swift_retain(ptr ) nounwind
15-
declare void @swift_unknownObjectRelease(ptr nocapture)
15+
declare void @swift_unknownObjectRelease(ptr captures(none))
1616
declare ptr @swift_unknownObjectRetain(ptr ) nounwind
1717
declare void @__swift_fixLifetime(ptr)
1818
declare void @noread_user(ptr) readnone

test/LLVMPasses/crash.ll

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ target triple = "x86_64-apple-macosx10.9"
88

99
declare { ptr, i64, ptr } @_Tsop1pFT3lhsNs6String3rhsS__S_(ptr, i64, ptr, ptr, i64, ptr)
1010
declare { ptr, i64, ptr } @_TNs6String24convertFromStringLiteralFT3valp_S_(ptr)
11-
declare void @swift_release(ptr nocapture)
11+
declare void @swift_release(ptr captures(none))
1212

1313

1414
@0 = private unnamed_addr constant [3 x i8] c"So\00"

test/LLVMPasses/disable_llvm_optzns.ll

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ declare void @swift_unknownObjectRelease(ptr)
1616
declare ptr @llvm.objc.retain(ptr)
1717
declare void @llvm.objc.release(ptr)
1818
declare ptr @swift_allocObject(ptr , i64, i64) nounwind
19-
declare void @swift_release(ptr nocapture)
19+
declare void @swift_release(ptr captures(none))
2020
declare ptr @swift_retain(ptr returned) nounwind
2121
declare ptr @swift_bridgeObjectRetain(ptr)
2222
declare void @swift_bridgeObjectRelease(ptr)

test/LLVMPasses/missing_runtime_declarations.ll

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
target datalayout = "e-p:64:64:64-S128-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f16:16:16-f32:32:32-f64:64:64-f128:128:128-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
44
target triple = "x86_64-apple-macosx10.9"
55

6-
; CHECK: declare void @swift_bridgeObjectRelease(ptr nocapture)
6+
; CHECK: declare void @swift_bridgeObjectRelease(ptr captures(none))
77

88
%a = type opaque
9-
declare void @swift_bridgeObjectRelease(ptr nocapture)
10-
declare ptr @swift_bridgeObjectRetain(ptr nocapture)
9+
declare void @swift_bridgeObjectRelease(ptr captures(none))
10+
declare ptr @swift_bridgeObjectRetain(ptr captures(none))
1111

1212
; CHECK-LABEL: define void @testcase1(ptr %0) {
1313
; CHECK: entry:

test/LLVMPasses/release_motion_landingpad.ll

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
target datalayout = "e-p:64:64:64-S128-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f16:16:16-f32:32:32-f64:64:64-f128:128:128-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
44
target triple = "x86_64-apple-macosx10.9"
55

6-
declare void @swift_release(ptr nocapture)
6+
declare void @swift_release(ptr captures(none))
77
declare void @swift_retain(ptr) nounwind
88
declare ptr @_Znwm(i64)
99
declare i32 @__gxx_personality_v0(...)

0 commit comments

Comments
 (0)