Merge branch 'main' into lazy-immediate

Author: zachary-kent

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/ComputeSideEffects.swift

@@ -142,6 +142,24 @@ private struct CollectedEffects {
         handleApply(pa)
         checkedIfDeinitBarrier = true
       }
+      // In addition to the effects of the apply, also consider the
+      // effects of the capture, which reads the captured value in
+      // order to move it into the context. This only applies to
+      // addressible values, because capturing does not dereference
+      // any class objects.
+      //
+      // Ignore captures for on-stack partial applies. They only
+      // bitwise-move or capture by address, so the call to
+      // handleApply above is sufficient. And, if they are not applied
+      // in this function, then they are never applied.
+      if !pa.isOnStack {
+        // the callee and its arguments are all captured...
+        for operand in pa.operands {
+          if operand.value.type.isAddress {
+            addEffects(.read, to: operand.value)
+          }
+        }
+      }
 
     case let fl as FixLifetimeInst:
       // A fix_lifetime instruction acts like a read on the operand to prevent

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/ASTContext.h

@@ -941,6 +941,10 @@ class ASTContext final {
   /// descriptors.
   AvailabilityContext getSignedDescriptorAvailability();
 
+  /// Get the runtime availability of the swift_initRawStructMetadata entrypoint
+  /// that fixes up the value witness table of @_rawLayout dependent types.
+  AvailabilityContext getInitRawStructMetadataAvailability();
+
   /// Get the runtime availability of features introduced in the Swift 5.2
   /// compiler for the target platform.
   AvailabilityContext getSwift52Availability();

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

@@ -650,13 +650,16 @@ class alignas(1 << DeclAlignInBits) Decl : public ASTAllocated<Decl> {
                         /// address diversified ptrauth qualified field.
                         IsNonTrivialPtrAuth : 1);
 
-  SWIFT_INLINE_BITFIELD(EnumDecl, NominalTypeDecl, 2+1,
+  SWIFT_INLINE_BITFIELD(EnumDecl, NominalTypeDecl, 2+1+1,
     /// True if the enum has cases and at least one case has associated values.
     HasAssociatedValues : 2,
     /// True if the enum has at least one case that has some availability
     /// attribute.  A single bit because it's lazily computed along with the
     /// HasAssociatedValues bit.
-    HasAnyUnavailableValues : 1
+    HasAnyUnavailableValues : 1,
+    /// True if \c isAvailableDuringLowering() is false for any cases. Lazily
+    /// computed along with HasAssociatedValues.
+    HasAnyUnavailableDuringLoweringValues : 1
   );
 
   SWIFT_INLINE_BITFIELD(ModuleDecl, TypeDecl, 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1,
@@ -895,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.
@@ -1237,7 +1236,10 @@ class alignas(1 << DeclAlignInBits) Decl : public ASTAllocated<Decl> {
   /// Returns true if this declaration should be considered available during
   /// SIL/IR lowering. A declaration would not be available during lowering if,
   /// for example, it is annotated as unavailable with `@available` and
-  /// optimization settings require that it be omitted.
+  /// optimization settings require that it be omitted. Canonical SIL must not
+  /// contain any references to declarations that are unavailable during
+  /// lowering because the resulting IR could reference non-existent symbols
+  /// and fail to link.
   bool isAvailableDuringLowering() const;
 
   /// Returns true if ABI compatibility stubs must be emitted for the given
@@ -2980,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.
@@ -4204,6 +4193,11 @@ class EnumDecl final : public NominalTypeDecl {
   /// A range for iterating the elements of an enum.
   using ElementRange = DowncastFilterRange<EnumElementDecl, DeclRange>;
 
+  /// A range for iterating the elements of an enum that are available during
+  /// lowering.
+  using ElementRangeForLowering = OptionalTransformRange<
+      ElementRange, AvailableDuringLoweringDeclFilter<EnumElementDecl>>;
+
   /// A range for iterating the cases of an enum.
   using CaseRange = DowncastFilterRange<EnumCaseDecl, DeclRange>;
 
@@ -4217,6 +4211,13 @@ class EnumDecl final : public NominalTypeDecl {
     return std::distance(eltRange.begin(), eltRange.end());
   }
 
+  /// Returns a range that iterates over all the elements of an enum for which
+  /// \c isAvailableDuringLowering() is true.
+  ElementRangeForLowering getAllElementsForLowering() const {
+    return ElementRangeForLowering(
+        getAllElements(), AvailableDuringLoweringDeclFilter<EnumElementDecl>());
+  }
+
   /// If this enum has a unique element, return it. A unique element can
   /// either hold a value or not, and the existence of one unique element does
   /// not imply the existence or non-existence of the opposite unique element.
@@ -4279,6 +4280,11 @@ class EnumDecl final : public NominalTypeDecl {
   /// Note that this is false for enums with absolutely no cases.
   bool hasPotentiallyUnavailableCaseValue() const;
 
+  /// True if \c isAvailableDuringLowering() is false for any cases.
+  ///
+  /// Note that this is false for enums with absolutely no cases.
+  bool hasCasesUnavailableDuringLowering() const;
+
   /// True if the enum has cases.
   bool hasCases() const {
     return !getAllElements().empty();
@@ -5973,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/DiagnosticsParse.def

@@ -1104,10 +1104,6 @@ ERROR(expected_expr_throw,PointsToFirstBadToken,
 // Discard Statement
 ERROR(expected_expr_discard,PointsToFirstBadToken,
       "expected expression in 'discard' statement", ())
-WARNING(forget_is_deprecated,PointsToFirstBadToken,
-      "'_forget' keyword is deprecated and will be removed soon; "
-      "use 'discard' instead",
-      ())
 
 // Await/Async
 ERROR(expected_await_not_async,none,

include/swift/AST/DiagnosticsSema.def

@@ -1800,6 +1800,11 @@ NOTE(objc_implementation_one_matched_requirement,none,
      "'@objc(%3)' to use it}2",
      (ValueDecl *, ObjCSelector, bool, StringRef))
 
+WARNING(wrap_objc_implementation_will_become_error,none,
+        "%0; this will become an error before '@_objcImplementation' is "
+        "stabilized",
+        (DiagnosticInfo *))
+
 ERROR(cdecl_not_at_top_level,none,
       "@_cdecl can only be applied to global functions", ())
 ERROR(cdecl_empty_name,none,
@@ -6687,7 +6692,7 @@ WARNING(hashvalue_implementation,Deprecation,
         "conform type %0 to 'Hashable' by implementing 'hash(into:)' instead",
         (Type))
 
-WARNING(executor_enqueue_unowned_implementation,Deprecation,
+WARNING(executor_enqueue_deprecated_unowned_implementation,Deprecation,
         "'Executor.enqueue(UnownedJob)' is deprecated as a protocol requirement; "
         "conform type %0 to 'Executor' by implementing 'func enqueue(ExecutorJob)' instead",
         (Type))
@@ -7082,7 +7087,7 @@ ERROR(attr_incompatible_with_back_deploy,none,
       "'%0' cannot be applied to a back deployed %1",
       (DeclAttribute, DescriptiveDeclKind))
 
-ERROR(backdeployed_opaque_result_not_supported,none,
+WARNING(backdeployed_opaque_result_not_supported,none,
       "'%0' is unsupported on a %1 with a 'some' return type",
       (DeclAttribute, DescriptiveDeclKind))
 
@@ -7154,9 +7159,7 @@ ERROR(macro_undefined,PointsToFirstBadToken,
       "no macro named %0", (Identifier))
 ERROR(external_macro_not_found,none,
       "external macro implementation type '%0.%1' could not be found for "
-      "macro %2; the type must be public and provided by a macro target in a "
-      "Swift package, or via '-plugin-path' or '-load-plugin-library'",
-      (StringRef, StringRef, DeclName))
+      "macro %2", (StringRef, StringRef, DeclName))
 ERROR(macro_must_be_defined,none,
       "macro %0 requires a definition", (DeclName))
 ERROR(external_macro_outside_macro_definition,none,
@@ -7374,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
 //------------------------------------------------------------------------------