[Distributed] Remove protocol accessible section; not used after all

Author: ktoso

include/swift/RemoteInspection/RuntimeHeaders/llvm/BinaryFormat/Swift.def

@@ -30,6 +30,4 @@ HANDLE_SWIFT_SECTION(protocs, "__swift5_protos", "swift5_protocols",
                      ".sw5prt$B")
 HANDLE_SWIFT_SECTION(acfuncs, "__swift5_acfuncs", "swift5_accessible_functions",
                      ".sw5acfn$B")
-HANDLE_SWIFT_SECTION(dacfuncs, "__swift5_acpfuns", "swift5_accessible_protocol_requirement_functions",
-                     ".sw5acpfn$B")
 HANDLE_SWIFT_SECTION(mpenum, "__swift5_mpenum", "swift5_mpenum", ".sw5mpen$B")

include/swift/Runtime/Config.h

@@ -307,10 +307,6 @@ extern uintptr_t __COMPATIBILITY_LIBRARIES_CANNOT_CHECK_THE_IS_SWIFT_BIT_DIRECTL
 #define __ptrauth_swift_accessible_function_record                             \
   __ptrauth(ptrauth_key_process_independent_data, 1,                           \
             SpecialPointerAuthDiscriminators::AccessibleFunctionRecord)
-#define __ptrauth_swift_accessible_protocol_requirement_function_record        \
-  __ptrauth(ptrauth_key_process_independent_data, 1,                           \
-            SpecialPointerAuthDiscriminators::                                 \
-                AccessibleProtocolRequirementFunctionRecord)
 #define __ptrauth_swift_objc_superclass                                        \
   __ptrauth(ptrauth_key_process_independent_data, 1,                           \
             swift::SpecialPointerAuthDiscriminators::ObjCSuperclass)
@@ -359,7 +355,6 @@ extern uintptr_t __COMPATIBILITY_LIBRARIES_CANNOT_CHECK_THE_IS_SWIFT_BIT_DIRECTL
 #define __ptrauth_swift_escalation_notification_function
 #define __ptrauth_swift_dispatch_invoke_function
 #define __ptrauth_swift_accessible_function_record
-#define __ptrauth_swift_accessible_protocol_requirement_function_record
 #define __ptrauth_swift_objc_superclass
 #define __ptrauth_swift_runtime_function_entry
 #define __ptrauth_swift_runtime_function_entry_with_key(__key)

lib/IRGen/GenDecl.cpp

@@ -4417,14 +4417,6 @@ void IRGenModule::addAccessibleFunction(SILFunction *func) {
   AccessibleFunctions.push_back(func);
 }
 
-void IRGenModule::addAccessibleFunctionDistributedAliased(
-    std::string mangledRecordName,
-    std::optional<std::string> mangledActorTypeName,
-    SILFunction *func) {
-  AccessibleProtocolFunctions.push_back(AccessibleProtocolFunctionsData(
-      func, mangledRecordName, mangledActorTypeName));
-}
-
 /// Emit the protocol conformance list and return it (if asContiguousArray is
 /// true, otherwise the records are emitted as individual globals and
 /// nullptr is returned).
@@ -4748,11 +4740,10 @@ void IRGenModule::emitAccessibleFunction(
 }
 
 void IRGenModule::emitAccessibleFunctions() {
-  if (AccessibleFunctions.empty() && AccessibleProtocolFunctions.empty())
+  if (AccessibleFunctions.empty())
     return;
 
   StringRef fnsSectionName;
-  StringRef protocolFnsSectionName;
   switch (TargetInfo.OutputObjectFormat) {
   case llvm::Triple::DXContainer:
   case llvm::Triple::GOFF:
@@ -4762,17 +4753,14 @@ void IRGenModule::emitAccessibleFunctions() {
                      "the selected object format.");
   case llvm::Triple::MachO:
     fnsSectionName = "__TEXT, __swift5_acfuncs, regular";
-    protocolFnsSectionName = "__TEXT, __swift5_acpfuns, regular";
     break;
   case llvm::Triple::ELF:
   case llvm::Triple::Wasm:
     fnsSectionName = "swift5_accessible_functions";
-    protocolFnsSectionName = "swift5_accessible_protocol_requirement_functions";
     break;
   case llvm::Triple::XCOFF:
   case llvm::Triple::COFF:
     fnsSectionName = ".sw5acfn$B";
-    protocolFnsSectionName = ".sw5acpfn$B";
     break;
   }
 
@@ -4786,24 +4774,6 @@ void IRGenModule::emitAccessibleFunctions() {
         fnsSectionName, mangledRecordName,
         /*mangledActorName=*/{}, mangledFunctionName, func);
   }
-
-  for (auto accessibleInfo : AccessibleProtocolFunctions) {
-    auto func = accessibleInfo.function;
-
-    std::string mangledRecordName =
-        accessibleInfo.mangledRecordName
-            ? (*accessibleInfo.mangledRecordName)
-            : LinkEntity::forAccessibleFunctionRecord(func).mangleAsString();
-    std::string mangledFunctionName =
-        LinkEntity::forSILFunction(func).mangleAsString();
-    std::string mangledActorName = accessibleInfo.concreteMangledTypeName
-                                       ? *accessibleInfo.concreteMangledTypeName
-                                       : "<none>";
-
-    emitAccessibleFunction(
-        protocolFnsSectionName, mangledRecordName,
-        mangledActorName, mangledFunctionName, func);
-  }
 }
 
 /// Fetch a global reference to a reference to the given Objective-C class.

lib/IRGen/IRGenModule.cpp

@@ -2232,8 +2232,3 @@ bool swift::writeEmptyOutputFilesFor(
   }
   return false;
 }
-IRGenModule::AccessibleProtocolFunctionsData::AccessibleProtocolFunctionsData(
-    SILFunction *function, const std::optional<std::string> &mangledRecordName,
-    const std::optional<std::string> &concreteMangledTypeName)
-    : function(function), mangledRecordName(mangledRecordName),
-      concreteMangledTypeName(concreteMangledTypeName) {}

lib/IRGen/IRGenModule.h

@@ -1152,10 +1152,6 @@ class IRGenModule {
   void addObjCClassStub(llvm::Constant *addr);
   void addProtocolConformance(ConformanceDescription &&conformance);
   void addAccessibleFunction(SILFunction *func);
-  void addAccessibleFunctionDistributedAliased(
-      std::string mangledRecordName,
-      std::optional<std::string> mangledActorTypeName,
-      SILFunction *func);
 
   llvm::Constant *emitSwiftProtocols(bool asContiguousArray);
   llvm::Constant *emitProtocolConformances(bool asContiguousArray);
@@ -1314,25 +1310,6 @@ class IRGenModule {
   /// up at runtime.
   SmallVector<SILFunction *, 4> AccessibleFunctions;
 
-  struct AccessibleProtocolFunctionsData {
-    SILFunction *function;
-    /// Mangled name of the requirement function.
-    std::optional<std::string> mangledRecordName;
-    std::optional<std::string> concreteMangledTypeName;
-    AccessibleProtocolFunctionsData(
-        SILFunction *function,
-        const std::optional<std::string> &mangledRecordName,
-        const std::optional<std::string> &concreteMangledTypeName);
-  };
-  /// List of all functions which are protocol *requirements* which may be
-  /// looked up by name at runtime. The record can be used to pair
-  /// a concrete implementation type with the protocol (record) name,
-  /// in order to locate the *witness* function name on this specific type.
-  ///
-  /// The witness function name can then be used to look up the witness at
-  /// runtime by inspecting `AccessibleFunctions`.
-  SmallVector<AccessibleProtocolFunctionsData, 4> AccessibleProtocolFunctions;
-
   /// Map of Objective-C protocols and protocol references, bitcast to i8*.
   /// The interesting global variables relating to an ObjC protocol.
   struct ObjCProtocolPair {

lib/IRGen/IRGenSIL.cpp

@@ -2476,36 +2476,7 @@ void IRGenSILFunction::emitSILFunction() {
     IGM.emitDistributedTargetAccessor(CurSILFn);
     IGM.addAccessibleFunction(CurSILFn);
 
-    if (auto val = CurSILFn->getLocation().castToASTNode<ValueDecl>()) {
-      if (auto attr =
-              val->getAttrs().getAttribute<DistributedThunkTargetAttr>()) {
-
-        // the original `distributed func`
-        auto func = attr->getTargetFunction();
-
-        auto distributedRequirements = func->getDistributedMethodWitnessedProtocolRequirements();
-        if (distributedRequirements.size() == 1) {
-          auto protocolFunc = distributedRequirements.front();
-          Mangle::ASTMangler mangler;
-          // The mangled name of the requirement is the name of the record
-          auto mangledProtocolFuncName =
-            mangler.mangleDistributedThunk(cast<FuncDecl>(protocolFunc));
-
-          std::optional<std::string> mangledActorTypeName;
-          if (isa<ClassDecl>(func->getDeclContext()->getAsDecl())) {
-            // a concrete type, not a "distributed" protocol
-            mangledActorTypeName = mangler.mangleAnyDecl(
-                func->getDeclContext()->getSelfNominalTypeDecl(),
-                /*prefix=*/true);
-          }
-
-          IGM.addAccessibleFunctionDistributedAliased(
-              /*mangledRecordName=*/mangledProtocolFuncName,
-              /*mangledActorTypeName=*/mangledActorTypeName,
-              CurSILFn);
-        }
-      }
-    }
+    // TODO(distributed): for protocols emit a special accessor
   }
 
   // Configure the dominance resolver.

stdlib/public/Distributed/DistributedActorSystem.swift

@@ -482,26 +482,6 @@ extension DistributedActorSystem {
     let targetName = target.identifier
     let targetNameUTF8 = Array(targetName.utf8)
 
-    let concreteTargetNameTypeNamePair: _SwiftNamePair?
-    if #available(SwiftStdlib 5.11, *) {
-      let dataAndLength = targetNameUTF8.withUnsafeBufferPointer { targetNameUTF8 in
-        _getConcreteAccessibleWitnessName(on: actor,
-          targetNameUTF8.baseAddress!, UInt(targetNameUTF8.endIndex))
-      }
-      // If the length is greater than zero it is a real value, nil otherwise
-      if dataAndLength.1 > 0 {
-        concreteTargetNameTypeNamePair = dataAndLength
-      } else {
-        concreteTargetNameTypeNamePair = nil
-      }
-    } else {
-      // protocol method targets not supported in previous Swift versions,
-      // the targetName can be assumed to be a concrete name
-      concreteTargetNameTypeNamePair = nil
-    }
-    let concreteTargetNameData = concreteTargetNameTypeNamePair?.0
-    let concreteTargetNameLength = (concreteTargetNameTypeNamePair?.1).map(UInt.init)
-
     // Gen the generic environment (if any) associated with the target.
     let genericEnv =
         targetNameUTF8.withUnsafeBufferPointer { targetNameUTF8 in

stdlib/public/Distributed/DistributedMetadata.swift

@@ -95,13 +95,13 @@ func __getReturnTypeInfo(
 /// uses to return String data/length pairs.
 typealias _SwiftNamePair = (UnsafePointer<UInt8>, Int)
 
-@available(SwiftStdlib 5.11, *)
-@_silgen_name("swift_distributed_getConcreteAccessibleWitnessName")
-func _getConcreteAccessibleWitnessName(
-  on actor: AnyObject, // : DistributedActor
-  _ targetNameStart: UnsafePointer<UInt8>,
-  _ targetNameLength: UInt
-) -> _SwiftNamePair
+//@available(SwiftStdlib 5.11, *)
+//@_silgen_name("swift_distributed_getConcreteAccessibleWitnessName")
+//func _getConcreteAccessibleWitnessName(
+//  on actor: AnyObject, // : DistributedActor
+//  _ targetNameStart: UnsafePointer<UInt8>,
+//  _ targetNameLength: UInt
+//) -> _SwiftNamePair
 
 /// Retrieve a generic environment descriptor associated with
 /// the given distributed target.

stdlib/public/SwiftShims/swift/shims/MetadataSections.h

@@ -97,7 +97,6 @@ struct MetadataSections {
   MetadataSectionRange swift5_capture;
   MetadataSectionRange swift5_mpenum;
   MetadataSectionRange swift5_accessible_functions;
-  MetadataSectionRange swift5_accessible_protocol_requirement_functions;
   MetadataSectionRange swift5_runtime_attributes;
   MetadataSectionRange swift5_tests;
 };