Merge pull request #82455 from eeckstein/adress-of-borrow-feature

Guard InlineArray addressors with feature flag

Author: eeckstein

include/swift/Basic/Features.def

@@ -268,6 +268,7 @@ LANGUAGE_FEATURE(AlwaysInheritActorContext, 472, "@_inheritActorContext(always)"
 LANGUAGE_FEATURE(BuiltinSelect, 0, "Builtin.select")
 LANGUAGE_FEATURE(BuiltinInterleave, 0, "Builtin.interleave and Builtin.deinterleave")
 LANGUAGE_FEATURE(BuiltinVectorsExternC, 0, "Extern C support for Builtin vector types")
+LANGUAGE_FEATURE(AddressOfProperty, 0, "Builtin.unprotectedAddressOf properties")
 
 // Swift 6
 UPCOMING_FEATURE(ConciseMagicFile, 274, 6)

lib/AST/FeatureSet.cpp

@@ -691,6 +691,7 @@ static bool usesFeatureDefaultIsolationPerFile(Decl *D) {
 UNINTERESTING_FEATURE(BuiltinSelect)
 UNINTERESTING_FEATURE(BuiltinInterleave)
 UNINTERESTING_FEATURE(BuiltinVectorsExternC)
+UNINTERESTING_FEATURE(AddressOfProperty)
 
 // ----------------------------------------------------------------------------
 // MARK: - FeatureSet

stdlib/public/core/InlineArray.swift

@@ -69,7 +69,11 @@ extension InlineArray where Element: ~Copyable {
   @_alwaysEmitIntoClient
   @_transparent
   internal var _address: UnsafePointer<Element> {
+#if $AddressOfProperty
     unsafe UnsafePointer<Element>(Builtin.unprotectedAddressOfBorrow(_storage))
+#else
+    unsafe UnsafePointer<Element>(Builtin.unprotectedAddressOfBorrow(self))
+#endif
   }
 
   /// Returns a buffer pointer over the entire array.
@@ -86,7 +90,11 @@ extension InlineArray where Element: ~Copyable {
   @_transparent
   internal var _mutableAddress: UnsafeMutablePointer<Element> {
     mutating get {
+#if $AddressOfProperty
       unsafe UnsafeMutablePointer<Element>(Builtin.unprotectedAddressOf(&_storage))
+#else
+      unsafe UnsafeMutablePointer<Element>(Builtin.unprotectedAddressOf(&self))
+#endif
     }
   }