[IRGen] [AST] NFC: Remove @runtimeMetadata related code and metadata records

Author: xedin

include/swift/ABI/Metadata.h

@@ -4907,48 +4907,6 @@ struct TargetAccessibleFunctionRecord final {
 
 using AccessibleFunctionRecord = TargetAccessibleFunctionRecord<InProcess>;
 
-/// A single entry in an runtine discoverable attribute record
-/// that relates a type attribute is attached to a generator function.
-template <typename Runtime>
-struct TargetRuntimeDiscoverableAttributeEntry {
-  RelativeDirectPointer<const char, /*nullable*/ false> Type;
-  RelativeDirectPointer<TargetAccessibleFunctionRecord<Runtime>> Generator;
-};
-
-/// A record that relates a runtime discoverable attribute to all of the
-/// types (i.e. a nominal type, method, property etc.) it's attached to.
-template <typename Runtime>
-class RuntimeDiscoverableAttributeRecord
-    : private swift::ABI::TrailingObjects<
-          RuntimeDiscoverableAttributeRecord<Runtime>,
-          TargetRuntimeDiscoverableAttributeEntry<Runtime>> {
-  using TrailingObjects = swift::ABI::TrailingObjects<
-      RuntimeDiscoverableAttributeRecord<Runtime>,
-      ConstTargetMetadataPointer<Runtime, TargetMetadata>>;
-  friend TrailingObjects;
-
-  uint32_t flags;
-
-  /// The nominal type that describes the attribute.
-  TargetRelativeIndirectablePointer<Runtime,
-                                    TargetTypeContextDescriptor<Runtime>,
-                                    /*nullable*/ false>
-      Attribute;
-
-  /// The number of types this attribute is associated with.
-  uint32_t numEntries;
-
-public:
-  uint32_t getFlags() { return flags; }
-
-  llvm::ArrayRef<TargetRuntimeDiscoverableAttributeEntry<Runtime>>
-  getEntries() const {
-    return {this->template getTrailingObjects<
-                TargetRuntimeDiscoverableAttributeEntry<Runtime>>(),
-            numEntries};
-  }
-};
-
 enum class PackLifetime : uint8_t {
   OnStack = 0,
   OnHeap = 1

include/swift/IRGen/Linking.h

@@ -342,11 +342,6 @@ class LinkEntity {
     /// the metadata cache once.
     CanonicalPrespecializedGenericTypeCachingOnceToken,
 
-    /// The record that describes an attribute that could be looked
-    /// up at runtime together with all types it's attached to and
-    /// generator functions.
-    RuntimeDiscoverableAttributeRecord,
-
     /// The same as AsyncFunctionPointer but with a different stored value, for
     /// use by TBDGen.
     /// The pointer is an AbstractFunctionDecl*.
@@ -1385,12 +1380,6 @@ class LinkEntity {
     return entity;
   }
 
-  static LinkEntity forRuntimeDiscoverableAttributeRecord(NominalTypeDecl *attr) {
-    LinkEntity entity;
-    entity.setForDecl(Kind::RuntimeDiscoverableAttributeRecord, attr);
-    return entity;
-  }
-
   void mangle(llvm::raw_ostream &out) const;
   void mangle(SmallVectorImpl<char> &buffer) const;
   std::string mangleAsString() const;

lib/IRGen/GenDecl.cpp

@@ -4533,101 +4533,6 @@ void IRGenModule::emitAccessibleFunctions() {
   }
 }
 
-void IRGenModule::emitRuntimeDiscoverableAttributes(
-    TinyPtrVector<FileUnit *> &filesToEmit) {
-  StringRef sectionName;
-  switch (TargetInfo.OutputObjectFormat) {
-  case llvm::Triple::DXContainer:
-  case llvm::Triple::GOFF:
-  case llvm::Triple::SPIRV:
-  case llvm::Triple::UnknownObjectFormat:
-    llvm_unreachable("Don't know how to emit attribute section for "
-                     "the selected object format.");
-  case llvm::Triple::MachO:
-    sectionName = "__TEXT, __swift5_rattrs, regular";
-    break;
-  case llvm::Triple::ELF:
-  case llvm::Triple::Wasm:
-    sectionName = "swift5_runtime_attributes";
-    break;
-  case llvm::Triple::XCOFF:
-  case llvm::Triple::COFF:
-    sectionName = ".sw5ratt$B";
-    break;
-  }
-
-  // Map attribute type to each declaration it's attached to
-  // and a corresponding generator function.
-  llvm::MapVector<NominalTypeDecl *, SmallVector<SILDeclRef, 2>> attributes;
-  {
-    for (auto *fileUnit : filesToEmit) {
-      auto *SF = dyn_cast<SourceFile>(fileUnit);
-      if (!SF)
-        continue;
-
-      for (auto *decl : SF->getDeclsWithRuntimeDiscoverableAttrs()) {
-        for (auto *attr : decl->getRuntimeDiscoverableAttrs()) {
-          auto *attrType = decl->getRuntimeDiscoverableAttrTypeDecl(attr);
-          attributes[attrType].push_back(
-              SILDeclRef::getRuntimeAttributeGenerator(attr, decl)
-                  .asRuntimeAccessible());
-        }
-      }
-    }
-  }
-
-  auto &SM = getSILModule();
-
-  for (auto &attr : attributes) {
-    auto *attrType = attr.first;
-    const auto &attachedTo = attr.second;
-
-    auto mangledRecordName =
-        LinkEntity::forRuntimeDiscoverableAttributeRecord(attrType)
-            .mangleAsString();
-
-    ConstantInitBuilder builder(*this);
-    ConstantStructBuilder B = builder.beginStruct();
-
-    // Flags
-    B.addInt32(0);
-
-    // Attribute metadata descriptor
-    B.addRelativeAddress(getAddrOfLLVMVariableOrGOTEquivalent(
-        LinkEntity::forNominalTypeDescriptor(attrType)));
-
-    // Number of types it's attached to.
-    B.addInt32(attachedTo.size());
-
-    // Emit all of the trailing objects
-    for (auto &ref : attachedTo) {
-      auto type = ref.getDecl()->getInterfaceType()->getCanonicalType();
-      auto *generator = SM.lookUpFunction(ref);
-
-      B.addRelativeAddress(
-          getTypeRef(type, /*genericSig=*/nullptr, MangledTypeRefRole::Metadata)
-              .first);
-      B.addRelativeAddressOrNull(getAddrOfAccessibleFunctionRecord(generator));
-    }
-
-    B.suggestType(RuntimeDiscoverableAttributeTy);
-
-    auto entity = LinkEntity::forRuntimeDiscoverableAttributeRecord(attrType);
-
-    auto *var = cast<llvm::GlobalVariable>(getAddrOfLLVMVariable(
-        entity, B.finishAndCreateFuture(), DebugTypeInfo()));
-
-    var->setConstant(true);
-    setTrueConstGlobal(var);
-
-    var->setSection(sectionName);
-    var->setAlignment(llvm::MaybeAlign(4));
-
-    disableAddressSanitizer(*this, var);
-    addUsedGlobal(var);
-  }
-}
-
 /// Fetch a global reference to a reference to the given Objective-C class.
 /// The result is of type ObjCClassPtrTy->getPointerTo().
 Address IRGenModule::getAddrOfObjCClassRef(ClassDecl *theClass) {

lib/IRGen/GenObjC.cpp

@@ -670,7 +670,6 @@ namespace {
       case SILDeclRef::Kind::PropertyWrapperInitFromProjectedValue:
       case SILDeclRef::Kind::EntryPoint:
       case SILDeclRef::Kind::AsyncEntryPoint:
-      case SILDeclRef::Kind::RuntimeAttributeGenerator:
         llvm_unreachable("Method does not have a selector");
 
       case SILDeclRef::Kind::Destroyer:

lib/IRGen/IRGen.cpp

@@ -1185,7 +1185,6 @@ GeneratedModule IRGenRequest::evaluate(Evaluator &evaluator,
       IGM.emitAccessibleFunctions();
       IGM.emitBuiltinReflectionMetadata();
       IGM.emitReflectionMetadataVersion();
-      IGM.emitRuntimeDiscoverableAttributes(filesToEmit);
       irgen.emitEagerClassInitialization();
       irgen.emitObjCActorsNeedingSuperclassSwizzle();
       irgen.emitDynamicReplacements();

lib/IRGen/IRGenMangler.h

@@ -651,12 +651,6 @@ class IRGenMangler : public Mangle::ASTMangler {
   std::string mangleSymbolNameForGenericEnvironment(
                                                 CanGenericSignature genericSig);
 
-  std::string
-  mangleRuntimeAccessibleAttributeRecord(const NominalTypeDecl *attr) {
-    assert(attr->getAttrs().hasAttribute<RuntimeMetadataAttr>());
-    return mangleNominalTypeSymbol(attr, "Ha");
-  }
-
 protected:
   SymbolicMangling
   withSymbolicReferences(IRGenModule &IGM,

lib/IRGen/IRGenModule.cpp

@@ -638,10 +638,6 @@ IRGenModule::IRGenModule(IRGenerator &irgen,
                        {RelativeAddressTy, RelativeAddressTy, RelativeAddressTy,
                         RelativeAddressTy, Int32Ty});
 
-  RuntimeDiscoverableAttributeTy =
-    createStructType(*this, "swift.runtime_attr",
-                     {Int32Ty, RelativeAddressTy, Int32Ty});
-
   AsyncFunctionPointerTy = createStructType(*this, "swift.async_func_pointer",
                                             {RelativeAddressTy, Int32Ty}, true);
   SwiftContextTy = llvm::StructType::create(getLLVMContext(), "swift.context");

lib/IRGen/IRGenModule.h

@@ -780,8 +780,6 @@ class IRGenModule {
   llvm::StructType *ClassMetadataBaseOffsetTy;
   llvm::StructType *DifferentiabilityWitnessTy; // { i8*, i8* }
 
-  llvm::StructType *RuntimeDiscoverableAttributeTy; // { i32, i32*, i32 }
-
   llvm::GlobalVariable *TheTrivialPropertyDescriptor = nullptr;
 
   llvm::GlobalVariable *swiftImmortalRefCount = nullptr;
@@ -1511,10 +1509,6 @@ private:                                                                       \
   void emitProtocolConformance(const ConformanceDescription &record);
   void emitNestedTypeDecls(DeclRange members);
   void emitClangDecl(const clang::Decl *decl);
-  /// Emit runtime discoverable attribute metadata section for the given set
-  /// of source files.
-  void
-  emitRuntimeDiscoverableAttributes(TinyPtrVector<FileUnit *> &filesToEmit);
 
   void finalizeClangCodeGen();
   void finishEmitAfterTopLevel();

lib/IRGen/Linking.cpp

@@ -537,11 +537,6 @@ std::string LinkEntity::mangleAsString() const {
     return mangler.mangleExtendedExistentialTypeShapeSymbol(
                      genSig, existentialType, isUnique);
   }
-
-  case Kind::RuntimeDiscoverableAttributeRecord: {
-    auto *attr = cast<NominalTypeDecl>(getDecl());
-    return mangler.mangleRuntimeAccessibleAttributeRecord(attr);
-  }
   }
   llvm_unreachable("bad entity kind!");
 }
@@ -888,9 +883,6 @@ SILLinkage LinkEntity::getLinkage(ForDefinition_t forDefinition) const {
   case Kind::ExtendedExistentialTypeShape:
     return (isExtendedExistentialTypeShapeShared()
               ? SILLinkage::Shared : SILLinkage::Private);
-  case Kind::RuntimeDiscoverableAttributeRecord:
-    return SILLinkage::Private;
-
   }
   llvm_unreachable("bad link entity kind");
 }
@@ -985,7 +977,6 @@ bool LinkEntity::isContextDescriptor() const {
   case Kind::DistributedAccessor:
   case Kind::AccessibleFunctionRecord:
   case Kind::ExtendedExistentialTypeShape:
-  case Kind::RuntimeDiscoverableAttributeRecord:
     return false;
   }
   llvm_unreachable("invalid descriptor");
@@ -1113,8 +1104,6 @@ llvm::Type *LinkEntity::getDefaultDeclarationType(IRGenModule &IGM) const {
     return IGM.AccessibleFunctionRecordTy;
   case Kind::ExtendedExistentialTypeShape:
     return IGM.RelativeAddressTy;
-  case Kind::RuntimeDiscoverableAttributeRecord:
-    return IGM.RuntimeDiscoverableAttributeTy;
   default:
     llvm_unreachable("declaration LLVM type not specified");
   }
@@ -1147,7 +1136,6 @@ Alignment LinkEntity::getAlignment(IRGenModule &IGM) const {
   case Kind::OpaqueTypeDescriptorRecord:
   case Kind::AccessibleFunctionRecord:
   case Kind::ExtendedExistentialTypeShape:
-  case Kind::RuntimeDiscoverableAttributeRecord:
     return Alignment(4);
   case Kind::AsyncFunctionPointer:
   case Kind::DispatchThunkAsyncFunctionPointer:
@@ -1312,7 +1300,6 @@ bool LinkEntity::isWeakImported(ModuleDecl *module) const {
   case Kind::DifferentiabilityWitness:
   case Kind::AccessibleFunctionRecord:
   case Kind::ExtendedExistentialTypeShape:
-  case Kind::RuntimeDiscoverableAttributeRecord:
     return false;
 
   case Kind::AsyncFunctionPointer:
@@ -1459,10 +1446,6 @@ DeclContext *LinkEntity::getDeclContextForEmission() const {
   case Kind::AccessibleFunctionRecord: {
     return getSILFunction()->getParentModule();
   }
-
-  case Kind::RuntimeDiscoverableAttributeRecord: {
-    return nullptr;
-  }
   }
   llvm_unreachable("invalid decl kind");
 }