[NFC] Replace @guaranteed_addr by @guaranteed_address

meg-gupta · meg-gupta · commit 25f0e2f9347f · 2025-10-20T09:05:37.000-07:00
diff --git a/SwiftCompilerSources/Sources/SIL/Argument.swift b/SwiftCompilerSources/Sources/SIL/Argument.swift
@@ -489,7 +489,7 @@ public enum ArgumentConvention : CustomStringConvertible {
     case .pack:
       self = .packOut
     case .guaranteed, .guaranteedAddress, .inout:
-      fatalError("Result conventions @guaranteed, @guaranteed_addr and @inout are always returned directly")
+      fatalError("Result conventions @guaranteed, @guaranteed_address and @inout are always returned directly")
     }
   }
 
diff --git a/include/swift/AST/TypeAttr.def b/include/swift/AST/TypeAttr.def
@@ -95,7 +95,7 @@ SIMPLE_SIL_TYPE_ATTR(pack_out, PackOut)
 SIMPLE_SIL_TYPE_ATTR(owned, Owned)
 SIMPLE_SIL_TYPE_ATTR(unowned_inner_pointer, UnownedInnerPointer)
 SIMPLE_SIL_TYPE_ATTR(guaranteed, Guaranteed)
-SIMPLE_SIL_TYPE_ATTR(guaranteed_addr, GuaranteedAddress)
+SIMPLE_SIL_TYPE_ATTR(guaranteed_address, GuaranteedAddress)
 SIMPLE_SIL_TYPE_ATTR(autoreleased, Autoreleased)
 SIMPLE_SIL_TYPE_ATTR(callee_owned, CalleeOwned)
 SIMPLE_SIL_TYPE_ATTR(callee_guaranteed, CalleeGuaranteed)
diff --git a/lib/AST/ASTPrinter.cpp b/lib/AST/ASTPrinter.cpp
@@ -7941,7 +7941,7 @@ static StringRef getStringForResultConvention(ResultConvention conv) {
   case ResultConvention::Autoreleased: return "@autoreleased ";
   case ResultConvention::Pack: return "@pack_out ";
   case ResultConvention::GuaranteedAddress:
-    return "@guaranteed_addr ";
+    return "@guaranteed_address ";
   case ResultConvention::Guaranteed:
     return "@guaranteed ";
   case ResultConvention::Inout:
diff --git a/lib/Demangling/Demangler.cpp b/lib/Demangling/Demangler.cpp
@@ -2297,7 +2297,7 @@ NodePointer Demangler::demangleImplResultConvention(Node::Kind ConvKind) {
     case 'a': attr = "@autoreleased"; break;
     case 'k': attr = "@pack_out"; break;
     case 'l':
-      attr = "@guaranteed_addr";
+      attr = "@guaranteed_address";
       break;
     case 'g':
       attr = "@guaranteed";
diff --git a/lib/Demangling/Remangler.cpp b/lib/Demangling/Remangler.cpp
@@ -2234,7 +2234,7 @@ ManglingError Remangler::mangleImplFunctionType(Node *node, unsigned depth) {
                 .Case("@unowned_inner_pointer", 'u')
                 .Case("@autoreleased", 'a')
                 .Case("@pack_out", 'k')
-                .Case("@guaranteed_addr", 'l')
+                .Case("@guaranteed_address", 'l')
                 .Case("@guaranteed", 'g')
                 .Case("@inout", 'm')
                 .Default(0);
diff --git a/lib/IRGen/GenCall.cpp b/lib/IRGen/GenCall.cpp
@@ -3981,7 +3981,7 @@ void CallEmission::emitToExplosion(Explosion &out, bool isOutlined) {
 
   if (fnConv.hasAddressResult()) {
     assert(LastArgWritten == 0 &&
-           "@guaranteed_addr/@inout along with indirect result?");
+           "@guaranteed_address/@inout along with indirect result?");
     emitAddressResultToExplosion(out);
     return;
   }
diff --git a/test/SIL/OwnershipVerifier/borrow_accessor.sil b/test/SIL/OwnershipVerifier/borrow_accessor.sil
@@ -19,7 +19,7 @@ bb0(%0 : @guaranteed $Wrapper):
   return %2                                       
 }
 
-sil [ossa] @borrow_addressonly_prop : $@convention(method) <T> (@in_guaranteed GenWrapper<T>) -> @guaranteed_addr T {
+sil [ossa] @borrow_addressonly_prop : $@convention(method) <T> (@in_guaranteed GenWrapper<T>) -> @guaranteed_address T {
 bb0(%0 : $*GenWrapper<T>):
   %2 = struct_element_addr %0, #GenWrapper._prop  
   return %2                                       
@@ -154,8 +154,8 @@ bb0(%0 : @owned $Wrapper):
 // TODO: Add verification support in MemoryLifetimeVerifier
 sil [ossa] @test_use_after_free_address_only : $@convention(thin) <T> (@in GenWrapper<T>) -> () {
 bb0(%0 : $*GenWrapper<T>):
-  %1 = function_ref @borrow_addressonly_prop : $@convention(method) <τ_0_0> (@in_guaranteed GenWrapper<τ_0_0>) -> @guaranteed_addr τ_0_0
-  %2 = apply %1<T>(%0) : $@convention(method) <τ_0_0> (@in_guaranteed GenWrapper<τ_0_0>) -> @guaranteed_addr τ_0_0
+  %1 = function_ref @borrow_addressonly_prop : $@convention(method) <τ_0_0> (@in_guaranteed GenWrapper<τ_0_0>) -> @guaranteed_address τ_0_0
+  %2 = apply %1<T>(%0) : $@convention(method) <τ_0_0> (@in_guaranteed GenWrapper<τ_0_0>) -> @guaranteed_address τ_0_0
   %3 = function_ref @use_T : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
   destroy_addr %0
   %5 = apply %3<T>(%2) : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
diff --git a/test/SIL/Parser/borrow_accessor.sil b/test/SIL/Parser/borrow_accessor.sil
@@ -19,8 +19,8 @@ bb0(%0 : @guaranteed $Wrapper):
   return %2                                       
 }
 
-// CHECK-LABEL: sil [ossa] @borrow_addressonly_prop : $@convention(method) <T> (@in_guaranteed GenWrapper<T>) -> @guaranteed_addr T {
-sil [ossa] @borrow_addressonly_prop : $@convention(method) <T> (@in_guaranteed GenWrapper<T>) -> @guaranteed_addr T {
+// CHECK-LABEL: sil [ossa] @borrow_addressonly_prop : $@convention(method) <T> (@in_guaranteed GenWrapper<T>) -> @guaranteed_address T {
+sil [ossa] @borrow_addressonly_prop : $@convention(method) <T> (@in_guaranteed GenWrapper<T>) -> @guaranteed_address T {
 bb0(%0 : $*GenWrapper<T>):
   %2 = struct_element_addr %0, #GenWrapper._prop  
   return %2                                       
@@ -61,8 +61,8 @@ bb0(%0 : @owned $Wrapper):
 
 sil [ossa] @test2 : $@convention(thin) <T> (@in GenWrapper<T>) -> () {
 bb0(%0 : $*GenWrapper<T>):
-  %1 = function_ref @borrow_addressonly_prop : $@convention(method) <τ_0_0> (@in_guaranteed GenWrapper<τ_0_0>) -> @guaranteed_addr τ_0_0
-  %2 = apply %1<T>(%0) : $@convention(method) <τ_0_0> (@in_guaranteed GenWrapper<τ_0_0>) -> @guaranteed_addr τ_0_0
+  %1 = function_ref @borrow_addressonly_prop : $@convention(method) <τ_0_0> (@in_guaranteed GenWrapper<τ_0_0>) -> @guaranteed_address τ_0_0
+  %2 = apply %1<T>(%0) : $@convention(method) <τ_0_0> (@in_guaranteed GenWrapper<τ_0_0>) -> @guaranteed_address τ_0_0
   %3 = function_ref @use_T : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
   %4 = apply %3<T>(%2) : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
   destroy_addr %0
diff --git a/test/SILGen/borrow_accessor.swift b/test/SILGen/borrow_accessor.swift
diff --git a/test/SILGen/borrow_accessor_container.swift b/test/SILGen/borrow_accessor_container.swift
diff --git a/test/SILGen/borrow_accessor_evolution.swift b/test/SILGen/borrow_accessor_evolution.swift

Original file line number	Diff line number	Diff line change
`@@ -489,7 +489,7 @@ public enum ArgumentConvention : CustomStringConvertible {`
`489`	`489`	`case .pack:`
`490`	`490`	`self = .packOut`
`491`	`491`	`case .guaranteed, .guaranteedAddress, .inout:`
`492`		`- fatalError("Result conventions @guaranteed, @guaranteed_addr and @inout are always returned directly")`
	`492`	`+ fatalError("Result conventions @guaranteed, @guaranteed_address and @inout are always returned directly")`
`493`	`493`	`}`
`494`	`494`	`}`
`495`	`495`
Original file line number	Diff line number	Diff line change
`@@ -3981,7 +3981,7 @@ void CallEmission::emitToExplosion(Explosion &out, bool isOutlined) {`
`3981`	`3981`
`3982`	`3982`	`if (fnConv.hasAddressResult()) {`
`3983`	`3983`	`assert(LastArgWritten == 0 &&`
`3984`		`- "@guaranteed_addr/@inout along with indirect result?");`
	`3984`	`+ "@guaranteed_address/@inout along with indirect result?");`
`3985`	`3985`	`emitAddressResultToExplosion(out);`
`3986`	`3986`	`return;`
`3987`	`3987`	`}`