Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

include/swift/SILOptimizer/Analysis/ArraySemantic.h

@@ -29,7 +29,6 @@ enum class ArrayCallKind {
   kGetCount,
   kGetCapacity,
   kGetElement,
-  kGetArrayOwner,
   kGetElementAddress,
   kMakeMutable,
   kMutateUnknown,

lib/SILOptimizer/Analysis/ArraySemantic.cpp

@@ -175,7 +175,6 @@ ArrayCallKind swift::ArraySemanticsCall::getKind() const {
             .Case("array.get_count", ArrayCallKind::kGetCount)
             .Case("array.get_capacity", ArrayCallKind::kGetCapacity)
             .Case("array.get_element", ArrayCallKind::kGetElement)
-            .Case("array.owner", ArrayCallKind::kGetArrayOwner)
             .Case("array.make_mutable", ArrayCallKind::kMakeMutable)
             .Case("array.get_element_address",
                   ArrayCallKind::kGetElementAddress)

lib/SILOptimizer/Analysis/EscapeAnalysis.cpp

@@ -1239,12 +1239,6 @@ void EscapeAnalysis::analyzeInstruction(SILInstruction *I,
           return;
         }
         break;
-      case ArrayCallKind::kGetArrayOwner:
-        if (CGNode *BufferNode = ConGraph->getNode(ASC.getSelf(), this)) {
-          ConGraph->defer(ConGraph->getNode(ASC.getCallResult(), this),
-                          BufferNode);
-        }
-        return;
       case ArrayCallKind::kGetElement:
         if (CGNode *AddrNode = ConGraph->getNode(ASC.getSelf(), this)) {
           CGNode *DestNode = nullptr;

lib/SILOptimizer/LoopTransforms/COWArrayOpt.cpp

@@ -515,7 +515,6 @@ static bool isNonMutatingArraySemanticCall(SILInstruction *Inst) {
   case ArrayCallKind::kGetCount:
   case ArrayCallKind::kGetCapacity:
   case ArrayCallKind::kGetElement:
-  case ArrayCallKind::kGetArrayOwner:
   case ArrayCallKind::kGetElementAddress:
     return true;
   case ArrayCallKind::kMakeMutable:

stdlib/public/core/ArraySlice.swift

@@ -161,31 +161,6 @@ extension ArraySlice {
     return _buffer.capacity
   }
 
-  /// - Precondition: The array has a native buffer.
-  @inlinable
-  @_semantics("array.owner")
-  internal func _getOwnerWithSemanticLabel_native() -> Builtin.NativeObject {
-    return Builtin.unsafeCastToNativeObject(_buffer.nativeOwner)
-  }
-
-  /// - Precondition: The array has a native buffer.
-  @inlinable
-  @inline(__always)
-  internal func _getOwner_native() -> Builtin.NativeObject {
-#if _runtime(_ObjC)
-    if _isClassOrObjCExistential(Element.self) {
-      // We are hiding the access to '_buffer.owner' behind
-      // _getOwner() to help the compiler hoist uniqueness checks in
-      // the case of class or Objective-C existential typed array
-      // elements.
-      return _getOwnerWithSemanticLabel_native()
-    }
-#endif
-    // In the value typed case the extra call to
-    // _getOwnerWithSemanticLabel_native hinders optimization.
-    return Builtin.unsafeCastToNativeObject(_buffer.owner)
-  }
-
   @inlinable
   @_semantics("array.make_mutable")
   internal mutating func _makeMutableAndUnique() {

test/api-digester/Inputs/stdlib-stable-abi.json

@@ -6529,48 +6529,6 @@
           ],
           "funcSelfKind": "NonMutating"
         },
-        {
-          "kind": "Function",
-          "name": "_getOwnerWithSemanticLabel_native",
-          "printedName": "_getOwnerWithSemanticLabel_native()",
-          "children": [
-            {
-              "kind": "TypeNominal",
-              "name": "BuiltinNativeObject",
-              "printedName": "Builtin.NativeObject"
-            }
-          ],
-          "declKind": "Func",
-          "usr": "s:s10ArraySliceV33_getOwnerWithSemanticLabel_nativeBoyF",
-          "moduleName": "Swift",
-          "genericSig": "<τ_0_0>",
-          "declAttributes": [
-            "Semantics",
-            "Inlinable"
-          ],
-          "funcSelfKind": "NonMutating"
-        },
-        {
-          "kind": "Function",
-          "name": "_getOwner_native",
-          "printedName": "_getOwner_native()",
-          "children": [
-            {
-              "kind": "TypeNominal",
-              "name": "BuiltinNativeObject",
-              "printedName": "Builtin.NativeObject"
-            }
-          ],
-          "declKind": "Func",
-          "usr": "s:s10ArraySliceV16_getOwner_nativeBoyF",
-          "moduleName": "Swift",
-          "genericSig": "<τ_0_0>",
-          "declAttributes": [
-            "Inline",
-            "Inlinable"
-          ],
-          "funcSelfKind": "NonMutating"
-        },
         {
           "kind": "Function",
           "name": "_makeMutableAndUnique",