[rebranch][test] Switch remaining tests from nocapture to captures(none)

AnthonyLatsis · AnthonyLatsis · commit d75128ff8df9 · 2025-05-08T03:24:01.000+01:00
Per 29441e4f5fa5f5c7709f7cf180815ba97f611297 (llvm-project).
diff --git a/test/IRGen/addressable.swift b/test/IRGen/addressable.swift
@@ -19,14 +19,14 @@ func getNE(_ holder: Holder) -> NE
 @lifetime(&holder)
 func getMutNE(_ holder: inout Holder) -> NE
 
-// The parameter cannot be 'nocapture'.
+// The parameter cannot be 'captures(none)'.
 //
 // CHECK-LABEL: define{{.*}} swiftcc void @"$s1A17testAddressableInyAA2NEVAA6HolderVF"(ptr noalias %0)
 public func testAddressableIn(_ holder: Holder) -> NE {
   getNE(holder)
 }
 
-// The parameter cannot be 'nocapture'.
+// The parameter cannot be 'captures(none)'.
 //
 // CHECK-LABEL: define{{.*}} swiftcc void @"$s1A20testAddressableInoutyAA2NEVAA6HolderVzF"(ptr %0)
 public func testAddressableInout(_ holder: inout Holder) -> NE {
diff --git a/test/IRGen/argument_attrs.sil b/test/IRGen/argument_attrs.sil
@@ -16,7 +16,7 @@ entry(%1 : $*Builtin.Int32, %2 : $*Builtin.Int32, %3 : $*Builtin.Int32, %4 : $Hu
   return undef : $()
 }
 
-// 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)
+// 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)
 sil @arguments_in_decl : $@convention(thin) <T> (@inout Builtin.Int32, @in Builtin.Int32, @in_guaranteed Builtin.Int32, Huge, @in T, @in ()) -> ()
 
 // 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
   return undef : $()
 }
 
-// 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)
+// 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)
 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
 
 // 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
   return %y : $Huge
 }
 
-// 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)
+// 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)
 sil @arguments_in_decl_huge_ret : $@convention(thin) <T> (@inout Builtin.Int32, @in Builtin.Int32, @in_guaranteed Builtin.Int32, Huge, @in T, @in ()) -> Huge
 
 
diff --git a/test/IRGen/empty_array.sil b/test/IRGen/empty_array.sil
@@ -15,11 +15,11 @@ sil_stage canonical
 
 import Builtin
 
-// CHECK-32-LABEL: define{{( protected)?}} void @empty_array(%swift.opaque* noalias nocapture) {{.*}} {
+// CHECK-32-LABEL: define{{( protected)?}} void @empty_array(%swift.opaque* noalias captures(none)) {{.*}} {
 // CHECK-32:         %1 = bitcast %swift.opaque* %0 to i8*
 // CHECK-32:         %2 = getelementptr inbounds i8, i8* %1, i32 0
 
-// CHECK-64-LABEL: define{{( protected)?}} void @empty_array(%swift.opaque* noalias nocapture) {{.*}} {
+// CHECK-64-LABEL: define{{( protected)?}} void @empty_array(%swift.opaque* noalias captures(none)) {{.*}} {
 // CHECK-64:         %1 = bitcast %swift.opaque* %0 to i8*
 // CHECK-64:         %2 = getelementptr inbounds i8, i8* %1, i64 0
 
diff --git a/test/IRGen/errors.sil b/test/IRGen/errors.sil
@@ -130,8 +130,8 @@ bb0(%0 : $Error):
 // CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc { ptr, ptr } @partial_apply_single(ptr %0)
 // CHECK:       insertvalue { ptr, ptr } { ptr @"$s27partial_apply_single_helperTA{{(\.ptrauth)?}}", ptr undef },
 
-// CHECK: define internal swiftcc void @"$s27partial_apply_single_helperTA"(ptr swiftself %0, ptr noalias nocapture{{( )?}}[[SWIFTERROR]]{{( )?}}dereferenceable({{.}}) %1)
-// CHECK:  tail call swiftcc void @partial_apply_single_helper(ptr {{%.*}}, ptr swiftself undef, ptr noalias nocapture{{( )?}}[[SWIFTERROR]]{{( )?}}dereferenceable({{.}}){{( )?}}{{%.*}})
+// CHECK: define internal swiftcc void @"$s27partial_apply_single_helperTA"(ptr swiftself %0, ptr noalias captures(none){{( )?}}[[SWIFTERROR]]{{( )?}}dereferenceable({{.}}) %1)
+// CHECK:  tail call swiftcc void @partial_apply_single_helper(ptr {{%.*}}, ptr swiftself undef, ptr noalias captures(none){{( )?}}[[SWIFTERROR]]{{( )?}}dereferenceable({{.}}){{( )?}}{{%.*}})
 // CHECK-NEXT:  ret void
 sil @partial_apply_single : $@convention(thin) (@owned A) -> @callee_owned () -> @error Error {
 entry(%0 : $A):
diff --git a/test/IRGen/indirect_return.swift b/test/IRGen/indirect_return.swift
@@ -14,7 +14,7 @@ protocol Number {}
 extension Int: Number {}
 
 // Make sure that the absence of the sret attribute matches.
-// CHECK: define hidden swiftcc void @"$s15indirect_return3fooSS_S2SAA6Number_pAaC_ptyF"(ptr noalias nocapture
+// CHECK: define hidden swiftcc void @"$s15indirect_return3fooSS_S2SAA6Number_pAaC_ptyF"(ptr noalias captures(none)
 func foo() -> (String, String, String, Number, Number) {
     return ("1", "2", "3", 42, 7)
 }
diff --git a/test/IRGen/protocol_resilience_thunks.swift b/test/IRGen/protocol_resilience_thunks.swift
@@ -60,12 +60,12 @@ public protocol MyResilientProtocol {
 // CHECK-NEXT: call swiftcc void [[WITNESS]](ptr noalias captures(none) sret({{.*}}) %0, ptr noalias swiftself %1, ptr %2, ptr %3)
 // CHECK-NEXT: ret void
 
-// CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @"$s26protocol_resilience_thunks19MyResilientProtocolP12throwingFuncyyKFTj"(ptr noalias swiftself %0, ptr{{( noalias nocapture( swifterror)? dereferenceable\(.\))?}} %1, ptr %2, ptr %3)
+// CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @"$s26protocol_resilience_thunks19MyResilientProtocolP12throwingFuncyyKFTj"(ptr noalias swiftself %0, ptr{{( noalias captures\(none\)( swifterror)? dereferenceable\(.\))?}} %1, ptr %2, ptr %3)
 // CHECK:      [[WITNESS_ADDR:%.*]] = getelementptr inbounds ptr, ptr %3, i32 4
 // CHECK-NEXT: [[WITNESS:%.*]] = load ptr, ptr [[WITNESS_ADDR]]
 // CHECK-arm64e-NEXT: ptrtoint ptr [[WITNESS_ADDR]] to i64
 // CHECK-arm64e-NEXT: call i64 @llvm.ptrauth.blend
-// CHECK-NEXT: call swiftcc void [[WITNESS]](ptr noalias swiftself %0, ptr{{( noalias nocapture( swifterror)? dereferenceable\(.\))?}} %1, ptr %2, ptr %3)
+// CHECK-NEXT: call swiftcc void [[WITNESS]](ptr noalias swiftself %0, ptr{{( noalias captures\(none\)( swifterror)? dereferenceable\(.\))?}} %1, ptr %2, ptr %3)
 // CHECK-NEXT: ret void
 
 // CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @"$s26protocol_resilience_thunks19MyResilientProtocolP11genericFuncyqd__qd__lFTj"(ptr noalias sret({{.*}}) %0, ptr noalias %1, ptr %2, ptr noalias swiftself %3, ptr %4, ptr %5)
diff --git a/test/IRGen/runtime_calling_conventions.swift b/test/IRGen/runtime_calling_conventions.swift
@@ -11,7 +11,7 @@ public class C {
 // Check that runtime functions use a proper calling convention.
 // CHECK-NOT: call void {{.*}} @swift_release
 
-// OPT-CHECK-LABEL: define {{(dllexport )?}}{{(protected )?}}swiftcc void @"$s{{(27|28)}}runtime_calling_conventions3fooyyAA1CCF"(ptr nocapture{{.*}} %0)
+// OPT-CHECK-LABEL: define {{(dllexport )?}}{{(protected )?}}swiftcc void @"$s{{(27|28)}}runtime_calling_conventions3fooyyAA1CCF"(ptr captures(none){{.*}} %0)
 // Check that runtime functions use a proper calling convention.
 // OPT-CHECK-NOT: tail call void @swift_release
 
diff --git a/test/LLVMPasses/allocation-deletion.ll b/test/LLVMPasses/allocation-deletion.ll
@@ -7,7 +7,7 @@ target triple = "x86_64-apple-macosx10.9"
 %swift.heapmetadata = type { ptr, ptr }
 
 declare ptr @swift_allocObject(ptr , i64, i64) nounwind
-declare void @swift_release(ptr nocapture)
+declare void @swift_release(ptr captures(none))
 declare void @swift_retain(ptr ) nounwind
 declare { i64, i64, i64 } @swift_retainAndReturnThree(ptr , i64, i64 , i64 )
 
@@ -36,7 +36,7 @@ entry:
 ; trivial_alloc_eliminate1 - Show that we can eliminate an allocation with a
 ; trivial destructor.
 @trivial_dtor_metadata = internal constant %swift.heapmetadata { ptr @trivial_dtor, ptr null }
-define internal i64 @trivial_dtor(ptr nocapture) nounwind readonly {
+define internal i64 @trivial_dtor(ptr captures(none)) nounwind readonly {
 entry:
   %1 = getelementptr inbounds %swift.refcounted, ptr %0, i64 1
   %length = load i64, ptr %1, align 8
diff --git a/test/LLVMPasses/basic.ll b/test/LLVMPasses/basic.ll
@@ -16,7 +16,7 @@ declare void @swift_unknownObjectRelease(ptr)
 declare ptr @llvm.objc.retain(ptr)
 declare void @llvm.objc.release(ptr)
 declare ptr @swift_allocObject(ptr , i64, i64) nounwind
-declare void @swift_release(ptr nocapture)
+declare void @swift_release(ptr captures(none))
 declare ptr @swift_retain(ptr returned) nounwind
 declare ptr @swift_bridgeObjectRetain(ptr)
 declare void @swift_bridgeObjectRelease(ptr)
diff --git a/test/LLVMPasses/contract.ll b/test/LLVMPasses/contract.ll
@@ -10,9 +10,9 @@ target triple = "x86_64-apple-macosx10.9"
 declare ptr @swift_allocObject(ptr , i64, i64) nounwind
 declare ptr @swift_bridgeObjectRetain(ptr)
 declare void @swift_bridgeObjectRelease(ptr )
-declare void @swift_release(ptr nocapture)
+declare void @swift_release(ptr captures(none))
 declare ptr @swift_retain(ptr ) nounwind
-declare void @swift_unknownObjectRelease(ptr nocapture)
+declare void @swift_unknownObjectRelease(ptr captures(none))
 declare ptr @swift_unknownObjectRetain(ptr ) nounwind
 declare void @__swift_fixLifetime(ptr)
 declare void @noread_user(ptr) readnone
diff --git a/test/LLVMPasses/crash.ll b/test/LLVMPasses/crash.ll
@@ -8,7 +8,7 @@ target triple = "x86_64-apple-macosx10.9"
 
 declare { ptr, i64, ptr } @_Tsop1pFT3lhsNs6String3rhsS__S_(ptr, i64, ptr, ptr, i64, ptr)
 declare { ptr, i64, ptr } @_TNs6String24convertFromStringLiteralFT3valp_S_(ptr)
-declare void @swift_release(ptr nocapture)
+declare void @swift_release(ptr captures(none))
 
 
 @0 = private unnamed_addr constant [3 x i8] c"So\00"
diff --git a/test/LLVMPasses/disable_llvm_optzns.ll b/test/LLVMPasses/disable_llvm_optzns.ll
@@ -16,7 +16,7 @@ declare void @swift_unknownObjectRelease(ptr)
 declare ptr @llvm.objc.retain(ptr)
 declare void @llvm.objc.release(ptr)
 declare ptr @swift_allocObject(ptr , i64, i64) nounwind
-declare void @swift_release(ptr nocapture)
+declare void @swift_release(ptr captures(none))
 declare ptr @swift_retain(ptr returned) nounwind
 declare ptr @swift_bridgeObjectRetain(ptr)
 declare void @swift_bridgeObjectRelease(ptr)
diff --git a/test/LLVMPasses/missing_runtime_declarations.ll b/test/LLVMPasses/missing_runtime_declarations.ll
@@ -3,11 +3,11 @@
 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"
 target triple = "x86_64-apple-macosx10.9"
 
-; CHECK: declare void @swift_bridgeObjectRelease(ptr nocapture)
+; CHECK: declare void @swift_bridgeObjectRelease(ptr captures(none))
 
 %a = type opaque
-declare void @swift_bridgeObjectRelease(ptr nocapture)
-declare ptr @swift_bridgeObjectRetain(ptr nocapture)
+declare void @swift_bridgeObjectRelease(ptr captures(none))
+declare ptr @swift_bridgeObjectRetain(ptr captures(none))
 
 ; CHECK-LABEL: define void @testcase1(ptr %0) {
 ; CHECK: entry:
diff --git a/test/LLVMPasses/release_motion_landingpad.ll b/test/LLVMPasses/release_motion_landingpad.ll
@@ -3,7 +3,7 @@
 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"
 target triple = "x86_64-apple-macosx10.9"
 
-declare void @swift_release(ptr nocapture)
+declare void @swift_release(ptr captures(none))
 declare void @swift_retain(ptr) nounwind
 declare ptr @_Znwm(i64)
 declare i32 @__gxx_personality_v0(...)

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ entry(%1 : $Builtin.Int32, %2 : $Builtin.Int32, %3 : $*Builtin.Int32, %4 : $Hu`
`16`	`16`	`return undef : $()`
`17`	`17`	`}`
`18`	`18`
`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)`
`20`	`20`	`sil @arguments_in_decl : $@convention(thin) <T> (@inout Builtin.Int32, @in Builtin.Int32, @in_guaranteed Builtin.Int32, Huge, @in T, @in ()) -> ()`
`21`	`21`
`22`	`22`	`// 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`
`31`	`31`	`return undef : $()`
`32`	`32`	`}`
`33`	`33`
`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)`
`35`	`35`	`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`
`36`	`36`
`37`	`37`	`// 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`
`46`	`46`	`return %y : $Huge`
`47`	`47`	`}`
`48`	`48`
`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)`
`50`	`50`	`sil @arguments_in_decl_huge_ret : $@convention(thin) <T> (@inout Builtin.Int32, @in Builtin.Int32, @in_guaranteed Builtin.Int32, Huge, @in T, @in ()) -> Huge`
`51`	`51`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ protocol Number {}`
`14`	`14`	`extension Int: Number {}`
`15`	`15`
`16`	`16`	`// Make sure that the absence of the sret attribute matches.`
`17`		`-// CHECK: define hidden swiftcc void @"$s15indirect_return3fooSS_S2SAA6Number_pAaC_ptyF"(ptr noalias nocapture`
	`17`	`+// CHECK: define hidden swiftcc void @"$s15indirect_return3fooSS_S2SAA6Number_pAaC_ptyF"(ptr noalias captures(none)`
`18`	`18`	`func foo() -> (String, String, String, Number, Number) {`
`19`	`19`	`return ("1", "2", "3", 42, 7)`
`20`	`20`	`}`