Merge pull request #67945 from xedin/remove-runtimeMetadata

[Frontend] NFC: Remove code and tests related to rejected @runtimeMetadata feature

Author: xedin

docs/ABI/Mangling.rst

@@ -150,7 +150,6 @@ Globals
   #endif
   global ::= protocol-conformance 'Hc'   // protocol conformance runtime record
   global ::= global 'HF'                 // accessible function runtime record
-  global ::= global 'Ha'                 // runtime discoverable attribute record
 
   global ::= nominal-type 'Mo'           // class metadata immediate member base offset
 

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/AST/ASTMangler.h

@@ -161,7 +161,6 @@ class ASTMangler : public Mangler {
     BackDeploymentThunk,
     BackDeploymentFallback,
     HasSymbolQuery,
-    RuntimeDiscoverableAttributeRecord,
   };
 
   /// lldb overrides the defaulted argument to 'true'.
@@ -363,10 +362,6 @@ class ASTMangler : public Mangler {
 
   std::string mangleHasSymbolQuery(const ValueDecl *decl);
 
-  std::string
-  mangleRuntimeAttributeGeneratorEntity(const ValueDecl *decl, CustomAttr *attr,
-                                        SymbolKind SKind = SymbolKind::Default);
-
   std::string mangleMacroExpansion(const FreestandingMacroExpansion *expansion);
   std::string mangleAttachedMacroExpansion(
       const Decl *decl, CustomAttr *attr, MacroRole role);
@@ -603,9 +598,6 @@ class ASTMangler : public Mangler {
 
   void appendConstrainedExistential(Type base, GenericSignature sig,
                                     const ValueDecl *forDecl);
-
-  void appendRuntimeAttributeGeneratorEntity(const ValueDecl *decl,
-                                             CustomAttr *attr);
 };
 
 } // end namespace Mangle

include/swift/AST/Attr.def

@@ -416,9 +416,6 @@ DECL_ATTR(_documentation, Documentation,
 SIMPLE_DECL_ATTR(_noMetadata, NoMetadata,
   OnGenericTypeParam | UserInaccessible | NotSerialized | ABIStableToAdd | ABIBreakingToRemove | APIStableToAdd | APIStableToRemove,
   138)
-SIMPLE_DECL_ATTR(runtimeMetadata, RuntimeMetadata,
-  OnStruct | OnClass | OnEnum | ABIBreakingToAdd | ABIBreakingToRemove | APIBreakingToAdd | APIBreakingToRemove,
-  139)
 SIMPLE_DECL_ATTR(_used, Used,
   OnAbstractFunction | OnVar | UserInaccessible | ABIBreakingToAdd | ABIBreakingToRemove | APIBreakingToAdd | APIBreakingToRemove,
   143)

include/swift/AST/ConstTypeInfo.h

@@ -233,20 +233,18 @@ struct ConstValueTypePropertyInfo {
   swift::VarDecl *VarDecl;
   std::shared_ptr<CompileTimeValue> Value;
   llvm::Optional<AttrValueVector> PropertyWrappers;
-  llvm::Optional<AttrValueVector> RuntimeMetadataAttributes;
 
   ConstValueTypePropertyInfo(
       swift::VarDecl *VarDecl, std::shared_ptr<CompileTimeValue> Value,
-      llvm::Optional<AttrValueVector> PropertyWrappers,
-      llvm::Optional<AttrValueVector> RuntimeMetadataAttributes)
-      : VarDecl(VarDecl), Value(Value), PropertyWrappers(PropertyWrappers),
-        RuntimeMetadataAttributes(RuntimeMetadataAttributes) {}
+      llvm::Optional<AttrValueVector> PropertyWrappers)
+      : VarDecl(VarDecl), Value(Value), PropertyWrappers(PropertyWrappers)
+    {}
 
   ConstValueTypePropertyInfo(swift::VarDecl *VarDecl,
                              std::shared_ptr<CompileTimeValue> Value)
       : VarDecl(VarDecl), Value(Value),
-        PropertyWrappers(llvm::Optional<AttrValueVector>()),
-        RuntimeMetadataAttributes(llvm::Optional<AttrValueVector>()) {}
+        PropertyWrappers(llvm::Optional<AttrValueVector>())
+    {}
 };
 
 struct ConstValueTypeInfo {

include/swift/AST/Decl.h

@@ -898,10 +898,6 @@ class alignas(1 << DeclAlignInBits) Decl : public ASTAllocated<Decl> {
     return Attrs;
   }
 
-  /// Retrieve runtime discoverable attributes (if any) associated
-  /// with this declaration.
-  ArrayRef<CustomAttr *> getRuntimeDiscoverableAttrs() const;
-
   /// Returns the attributes that were directly attached to this declaration
   /// as written in source, ie. does not include attributes generated by macro
   /// expansions.
@@ -2986,19 +2982,6 @@ class ValueDecl : public Decl {
   /// 'func foo(Int) -> () -> Self?'.
   GenericParameterReferenceInfo findExistentialSelfReferences(
       Type baseTy, bool treatNonResultCovariantSelfAsInvariant) const;
-
-  /// Retrieve a nominal type declaration backing given runtime discoverable
-  /// attribute.
-  ///
-  /// FIXME: This should be a more general facility but its unclear where
-  ///        to place it for maximum impact.
-  NominalTypeDecl *getRuntimeDiscoverableAttrTypeDecl(CustomAttr *attr) const;
-
-  /// Given a runtime discoverable attribute, return a generator
-  /// which could be used to instantiate it for this declaration
-  /// together with its result type.
-  std::pair<BraceStmt *, Type>
-  getRuntimeDiscoverableAttributeGenerator(CustomAttr *) const;
 };
 
 /// This is a common base class for declarations which declare a type.
@@ -5996,9 +5979,6 @@ class VarDecl : public AbstractStorageDecl {
   /// that has an external effect on the function.
   bool hasExternalPropertyWrapper() const;
 
-  /// Whether this property has any attached runtime metadata attributes.
-  bool hasRuntimeMetadataAttributes() const;
-
   /// Whether all of the attached property wrappers have an init(wrappedValue:)
   /// initializer.
   bool allAttachedPropertyWrappersHaveWrappedValueInit() const;

include/swift/AST/DiagnosticsSema.def

@@ -7377,62 +7377,6 @@ ERROR(noncopyable_cannot_have_read_set_accessor,none,
       "noncopyable %select{variable|subscript}0 cannot provide a read and set accessor",
       (unsigned))
 
-//------------------------------------------------------------------------------
-// MARK: Runtime discoverable attributes (@runtimeMetadata)
-//------------------------------------------------------------------------------
-
-ERROR(runtime_discoverable_attrs_are_experimental,none,
-      "runtime discoverable attributes are an experimental feature", ())
-
-ERROR(invalid_decl_for_runtime_discoverable_attr,none,
-      "@%0 can only be applied to non-generic types, methods, "
-      "instance properties, and global functions", (StringRef))
-
-ERROR(invalid_decl_for_runtime_discoverable_attr_in_extension,none,
-      "@%0 can only be applied to unavailable extensions in the same module"
-      " as %1", (StringRef, DeclName))
-
-ERROR(invalid_attr_redeclaration_in_extension,none,
-      "@%0 is already applied to type %1; did you want to remove it?",
-      (StringRef, DeclName))
-
-ERROR(duplicate_runtime_discoverable_attr,none,
-      "duplicate runtime discoverable attribute", ())
-
-ERROR(runtime_attribute_requires_init,none,
-      "runtime attribute type %0 does not contain a required initializer"
-      " - init(attachedTo:)",
-      (DeclName))
-
-ERROR(runtime_attribute_type_failable_init,none,
-      "runtime attribute type initializer %0 cannot be failable", (DeclName))
-
-ERROR(runtime_attribute_type_requirement_not_accessible,none,
-      "%select{private|fileprivate|internal|package|public|open}0 %kind1 cannot have "
-      "more restrictive access than its enclosing runtime attribute type %2 "
-      "(which is %select{private|fileprivate|internal|package|public|open}3)",
-      (AccessLevel, const ValueDecl *, Type, AccessLevel))
-
-ERROR(cannot_use_attr_with_custom_arguments_on_protocol,none,
-      "reflection metadata attributes applied to protocols cannot have"
-      " additional attribute arguments; attribute arguments must be"
-      " explicitly written on the conforming type",
-      ())
-
-NOTE(missing_reflection_metadata_attribute_on_type,none,
-     "protocol %0 requires reflection metadata attribute @%1",
-     (DeclName, StringRef))
-
-ERROR(missing_reflection_metadata_attribute_on_subclass,none,
-      "superclass %0 requires reflection metadata attribute @%1",
-      (DeclName, StringRef))
-NOTE(add_missing_reflection_metadata_attr,none,
-     "add missing reflection metadata attribute @%0", (StringRef))
-NOTE(opt_out_from_missing_reflection_metadata_attr,none,
-     "opt-out of reflection metadata attribute @%0 using"
-     " unavailable extension",
-     (StringRef))
-
 //------------------------------------------------------------------------------
 // MARK: Init accessors
 //------------------------------------------------------------------------------

include/swift/AST/Initializer.h

@@ -36,9 +36,6 @@ enum class InitializerKind : uint8_t {
 
   /// A property wrapper initialization expression.
   PropertyWrapper,
-
-  /// A runtime discoverable attribute initialization expression.
-  RuntimeAttribute,
 };
 
 /// An Initializer is a kind of DeclContext used for expressions that
@@ -236,35 +233,6 @@ class PropertyWrapperInitializer : public Initializer {
   }
 };
 
-/// A runtime discoverable attribute initialization expression context.
-///
-/// The parent context is context of the file/module this generator is
-/// synthesized in.
-class RuntimeAttributeInitializer : public Initializer {
-  CustomAttr *Attr;
-  ValueDecl *AttachedTo;
-
-public:
-  explicit RuntimeAttributeInitializer(CustomAttr *attr, ValueDecl *attachedTo)
-      : Initializer(InitializerKind::RuntimeAttribute,
-                    attachedTo->getDeclContext()),
-        Attr(attr), AttachedTo(attachedTo) {}
-
-  CustomAttr *getAttr() const { return Attr; }
-
-  ValueDecl *getAttachedToDecl() const { return AttachedTo; }
-
-  static bool classof(const DeclContext *DC) {
-    if (auto init = dyn_cast<Initializer>(DC))
-      return classof(init);
-    return false;
-  }
-
-  static bool classof(const Initializer *I) {
-    return I->getInitializerKind() == InitializerKind::RuntimeAttribute;
-  }
-};
-
 } // end namespace swift
 
 #endif

include/swift/AST/SourceFile.h

@@ -166,10 +166,6 @@ class SourceFile final : public FileUnit {
   /// if it were done from OpaqueResultTypeRequest.
   llvm::SetVector<OpaqueTypeDecl *> UnvalidatedOpaqueReturnTypes;
 
-  /// The set of declarations with valid runtime discoverable attributes
-  /// located in the source file.
-  llvm::SetVector<ValueDecl *> DeclsWithRuntimeDiscoverableAttrs;
-
   /// The list of top-level items in the source file. This is \c None if
   /// they have not yet been parsed.
   /// FIXME: Once addTopLevelDecl/prependTopLevelDecl
@@ -229,10 +225,6 @@ class SourceFile final : public FileUnit {
   /// Add a hoisted declaration. See Decl::isHoisted().
   void addHoistedDecl(Decl *d);
 
-  /// Add a declaration with any number of runtime disoverable attributes
-  /// associated with it.
-  void addDeclWithRuntimeDiscoverableAttrs(ValueDecl *);
-
   /// Retrieves an immutable view of the list of top-level items in this file.
   ArrayRef<ASTNode> getTopLevelItems() const;
 
@@ -245,10 +237,6 @@ class SourceFile final : public FileUnit {
   /// See Decl::isHoisted().
   ArrayRef<Decl *> getHoistedDecls() const;
 
-  /// Retrieves an immutable view of the set of all declaration with runtime
-  /// discoverable attributes located in this file.
-  ArrayRef<ValueDecl *> getDeclsWithRuntimeDiscoverableAttrs() const;
-
   /// Retrieves an immutable view of the top-level items if they have already
   /// been parsed, or \c None if they haven't. Should only be used for dumping.
   llvm::Optional<ArrayRef<ASTNode>> getCachedTopLevelItems() const {

include/swift/AST/TypeCheckRequests.h

@@ -3646,10 +3646,6 @@ enum class CustomAttrTypeKind {
   /// Global actors are represented as custom type attributes. They don't
   /// have any particularly interesting semantics.
   GlobalActor,
-
-  /// Attributes that are discoverable/constructable at runtime given a name.
-  /// They allow unbound generic types.
-  RuntimeMetadata,
 };
 
 void simple_display(llvm::raw_ostream &out, CustomAttrTypeKind value);
@@ -4242,57 +4238,6 @@ class ExternalMacroDefinitionRequest
   bool isCached() const { return true; }
 };
 
-class GetRuntimeDiscoverableAttributes
-    : public SimpleRequest<GetRuntimeDiscoverableAttributes,
-                           ArrayRef<CustomAttr *>(Decl *),
-                           RequestFlags::Cached> {
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  ArrayRef<CustomAttr *> evaluate(Evaluator &evaluator, Decl *decl) const;
-
-public:
-  bool isCached() const { return true; }
-};
-
-class SynthesizeRuntimeMetadataAttrGenerator
-    : public SimpleRequest<SynthesizeRuntimeMetadataAttrGenerator,
-                           Expr *(CustomAttr *, ValueDecl *),
-                           RequestFlags::Cached> {
-
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  Expr *evaluate(Evaluator &evaluator, CustomAttr *attr,
-                 ValueDecl *attachedTo) const;
-
-public:
-  bool isCached() const { return true; }
-};
-
-class SynthesizeRuntimeMetadataAttrGeneratorBody
-    : public SimpleRequest<SynthesizeRuntimeMetadataAttrGeneratorBody,
-                           BraceStmt *(CustomAttr *, ValueDecl *),
-                           RequestFlags::Cached> {
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  BraceStmt *evaluate(Evaluator &evaluator, CustomAttr *attr,
-                      ValueDecl *attachedTo) const;
-
-public:
-  bool isCached() const { return true; }
-};
-
 /// Compute the local discriminators for the given declaration context.
 ///
 /// This is a state-changing operation for closures within the context, which