Merge pull request #84606 from swiftlang/rebranch

Merge clang 21.x rebranch into main

Author: shahmishal

include/swift/ABI/ObjectFile.h

@@ -83,7 +83,7 @@ class SwiftObjectFileFormatELF : public SwiftObjectFileFormat {
   }
 };
 
-/// Responsible for providing the COFF reflection section identifiers
+/// Responsible for providing the COFF reflection section identifiers.
 class SwiftObjectFileFormatCOFF : public SwiftObjectFileFormat {
 public:
   llvm::StringRef getSectionName(ReflectionSectionKind section) override {
@@ -101,5 +101,28 @@ class SwiftObjectFileFormatCOFF : public SwiftObjectFileFormat {
     return sectionName.starts_with(".sw5");
   }
 };
+
+/// Responsible for providing the WebAssembly reflection section identifiers.
+/// WebAssembly binaries store all reflection metadata in the DATA
+/// section. There are symbols for each reflection section kind in the "name"
+/// section that point to the corresponding offset inside DATA.
+class SwiftObjectFileFormatWasm : public SwiftObjectFileFormat {
+public:
+  llvm::StringRef getSectionName(ReflectionSectionKind section) override {
+    switch (section) {
+#define HANDLE_SWIFT_SECTION(KIND, MACHO, ELF, COFF)                           \
+  case KIND:                                                                   \
+    return ELF;
+#include "llvm/BinaryFormat/Swift.def"
+#undef HANDLE_SWIFT_SECTION
+    }
+    llvm_unreachable("Section  not found.");
+  }
+
+  bool sectionContainsReflectionData(llvm::StringRef sectionName) override {
+    return sectionName.starts_with("swift5_");
+  }
+};
+
 } // namespace swift
 #endif // SWIFT_ABI_OBJECTFILE_H

include/swift/AST/Attr.h

@@ -1098,7 +1098,7 @@ class ObjCAttr final : public DeclAttribute,
     unsigned length = 2;
     if (auto name = getName())
       length += name->getNumSelectorPieces();
-    return {getTrailingObjects<SourceLoc>(), length};
+    return getTrailingObjects(length);
   }
 
   /// Retrieve the trailing location information.
@@ -1107,7 +1107,7 @@ class ObjCAttr final : public DeclAttribute,
     unsigned length = 2;
     if (auto name = getName())
       length += name->getNumSelectorPieces();
-    return {getTrailingObjects<SourceLoc>(), length};
+    return getTrailingObjects(length);
   }
 
 public:
@@ -1283,14 +1283,14 @@ class DynamicReplacementAttr final
   MutableArrayRef<SourceLoc> getTrailingLocations() {
     assert(Bits.DynamicReplacementAttr.HasTrailingLocationInfo);
     unsigned length = 2;
-    return {getTrailingObjects<SourceLoc>(), length};
+    return getTrailingObjects(length);
   }
 
   /// Retrieve the trailing location information.
   ArrayRef<SourceLoc> getTrailingLocations() const {
     assert(Bits.DynamicReplacementAttr.HasTrailingLocationInfo);
     unsigned length = 2; // lParens, rParens
-    return {getTrailingObjects<SourceLoc>(), length};
+    return getTrailingObjects(length);
   }
 
 public:
@@ -1480,8 +1480,7 @@ class SPIAccessControlAttr final : public DeclAttribute,
   /// Note: A single SPI name per attribute is currently supported but this
   /// may change with the syntax change.
   ArrayRef<Identifier> getSPIGroups() const {
-    return { this->template getTrailingObjects<Identifier>(),
-             numSPIGroups };
+    return getTrailingObjects(numSPIGroups);
   }
 
   static bool classof(const DeclAttribute *DA) {
@@ -2059,11 +2058,11 @@ class StorageRestrictionsAttr final
   unsigned getNumAccessesProperties() const { return NumAccesses; }
 
   ArrayRef<Identifier> getInitializesNames() const {
-    return {getTrailingObjects<Identifier>(), NumInitializes};
+    return getTrailingObjects(NumInitializes);
   }
 
   ArrayRef<Identifier> getAccessesNames() const {
-    return {getTrailingObjects<Identifier>() + NumInitializes, NumAccesses};
+    return {getTrailingObjects() + NumInitializes, NumAccesses};
   }
 
   ArrayRef<VarDecl *> getInitializesProperties(AccessorDecl *attachedTo) const;
@@ -2562,10 +2561,10 @@ class DifferentiableAttr final
   /// The parsed differentiability parameters, i.e. the list of parameters
   /// specified in 'wrt:'.
   ArrayRef<ParsedAutoDiffParameter> getParsedParameters() const {
-    return {getTrailingObjects<ParsedAutoDiffParameter>(), NumParsedParameters};
+    return getTrailingObjects(NumParsedParameters);
   }
   MutableArrayRef<ParsedAutoDiffParameter> getParsedParameters() {
-    return {getTrailingObjects<ParsedAutoDiffParameter>(), NumParsedParameters};
+    return getTrailingObjects(NumParsedParameters);
   }
   size_t numTrailingObjects(OverloadToken<ParsedAutoDiffParameter>) const {
     return NumParsedParameters;
@@ -2747,10 +2746,10 @@ class DerivativeAttr final
   /// The parsed differentiability parameters, i.e. the list of parameters
   /// specified in 'wrt:'.
   ArrayRef<ParsedAutoDiffParameter> getParsedParameters() const {
-    return {getTrailingObjects<ParsedAutoDiffParameter>(), NumParsedParameters};
+    return getTrailingObjects(NumParsedParameters);
   }
   MutableArrayRef<ParsedAutoDiffParameter> getParsedParameters() {
-    return {getTrailingObjects<ParsedAutoDiffParameter>(), NumParsedParameters};
+    return getTrailingObjects(NumParsedParameters);
   }
   size_t numTrailingObjects(OverloadToken<ParsedAutoDiffParameter>) const {
     return NumParsedParameters;
@@ -2838,10 +2837,10 @@ class TransposeAttr final
   /// The parsed linearity parameters, i.e. the list of parameters specified in
   /// 'wrt:'.
   ArrayRef<ParsedAutoDiffParameter> getParsedParameters() const {
-    return {getTrailingObjects<ParsedAutoDiffParameter>(), NumParsedParameters};
+    return getTrailingObjects(NumParsedParameters);
   }
   MutableArrayRef<ParsedAutoDiffParameter> getParsedParameters() {
-    return {getTrailingObjects<ParsedAutoDiffParameter>(), NumParsedParameters};
+    return getTrailingObjects(NumParsedParameters);
   }
   size_t numTrailingObjects(OverloadToken<ParsedAutoDiffParameter>) const {
     return NumParsedParameters;
@@ -3492,8 +3491,8 @@ class AllowFeatureSuppressionAttr final
   bool getInverted() const { return Bits.AllowFeatureSuppressionAttr.Inverted; }
 
   ArrayRef<Identifier> getSuppressedFeatures() const {
-    return {getTrailingObjects<Identifier>(),
-            static_cast<size_t>(Bits.AllowFeatureSuppressionAttr.NumFeatures)};
+    return getTrailingObjects(
+        static_cast<size_t>(Bits.AllowFeatureSuppressionAttr.NumFeatures));
   }
 
   static bool classof(const DeclAttribute *DA) {

include/swift/AST/AvailabilityContextStorage.h

@@ -82,7 +82,7 @@ class AvailabilityContext::Storage final
                             const ASTContext &ctx);
 
   llvm::ArrayRef<DomainInfo> getDomainInfos() const {
-    return llvm::ArrayRef(getTrailingObjects<DomainInfo>(), domainInfoCount);
+    return getTrailingObjects(domainInfoCount);
   }
 
   llvm::SmallVector<DomainInfo, 4> copyDomainInfos() const {

include/swift/AST/Builtins.h

@@ -121,12 +121,13 @@ class BuiltinInfo {
 
 /// The information identifying the llvm intrinsic - its id and types.
 class IntrinsicInfo {
-  mutable llvm::AttributeList Attrs =
-      llvm::DenseMapInfo<llvm::AttributeList>::getEmptyKey();
+  mutable llvm::AttributeSet FnAttrs =
+      llvm::DenseMapInfo<llvm::AttributeSet>::getEmptyKey();
+
 public:
   llvm::Intrinsic::ID ID;
   SmallVector<Type, 4> Types;
-  const llvm::AttributeList &getOrCreateAttributes(ASTContext &Ctx) const;
+  const llvm::AttributeSet &getOrCreateFnAttributes(ASTContext &Ctx) const;
 };
 
 /// Turn a string like "release" into the LLVM enum.

include/swift/AST/Decl.h

@@ -1777,8 +1777,8 @@ class ImportDecl final : public Decl,
   ///          path will include 'Foo'. This return value is always owned by \c ImportDecl
   ///          (which is owned by the AST context), so it can be persisted.
   ImportPath getImportPath() const {
-    return ImportPath({ getTrailingObjects<ImportPath::Element>(),
-                        static_cast<size_t>(Bits.ImportDecl.NumPathElements) });
+    return ImportPath(getTrailingObjects(
+        static_cast<size_t>(Bits.ImportDecl.NumPathElements)));
   }
 
   /// Retrieves the import path, replacing any module aliases with real names.
@@ -2824,7 +2824,7 @@ class PatternBindingDecl final : public Decl,
 private:
   MutableArrayRef<PatternBindingEntry> getMutablePatternList() {
     // Pattern entries are tail allocated.
-    return {getTrailingObjects<PatternBindingEntry>(), getNumPatternEntries()};
+    return getTrailingObjects(getNumPatternEntries());
   }
 };
 
@@ -3680,10 +3680,7 @@ class OpaqueTypeDecl final :
   /// Retrieve the buffer containing the opaque return type
   /// representations that correspond to the opaque generic parameters.
   ArrayRef<TypeRepr *> getOpaqueReturnTypeReprs() const {
-    return {
-      getTrailingObjects<TypeRepr *>(),
-      getNumOpaqueReturnTypeReprs()
-    };
+    return getTrailingObjects(getNumOpaqueReturnTypeReprs());
   }
 
   /// Should the underlying type be visible to clients outside of the module?
@@ -3749,13 +3746,12 @@ class OpaqueTypeDecl final :
           Substitutions(substitutions) {
       assert(!availabilityQueries.empty());
       std::uninitialized_copy(availabilityQueries.begin(),
-                              availabilityQueries.end(),
-                              getTrailingObjects<AvailabilityQuery>());
+                              availabilityQueries.end(), getTrailingObjects());
     }
 
   public:
     ArrayRef<AvailabilityQuery> getAvailabilityQueries() const {
-      return {getTrailingObjects<AvailabilityQuery>(), NumAvailabilityQueries};
+      return getTrailingObjects(NumAvailabilityQueries);
     }
 
     SubstitutionMap getSubstitutions() const { return Substitutions; }
@@ -5949,7 +5945,7 @@ class AbstractStorageDecl : public ValueDecl {
     inline AccessorDecl *getAccessor(AccessorKind kind) const;
 
     ArrayRef<AccessorDecl *> getAllAccessors() const {
-      return { getTrailingObjects<AccessorDecl*>(), NumAccessors };
+      return getTrailingObjects(NumAccessors);
     }
 
     void addOpaqueAccessor(AccessorDecl *accessor);
@@ -5958,7 +5954,7 @@ class AbstractStorageDecl : public ValueDecl {
 
   private:
     MutableArrayRef<AccessorDecl *> getAccessorsBuffer() {
-      return { getTrailingObjects<AccessorDecl*>(), NumAccessors };
+      return getTrailingObjects(NumAccessors);
     }
 
     bool registerAccessor(AccessorDecl *accessor, AccessorIndex index);
@@ -8811,7 +8807,7 @@ class EnumCaseDecl final : public Decl,
   {
     Bits.EnumCaseDecl.NumElements = Elements.size();
     std::uninitialized_copy(Elements.begin(), Elements.end(),
-                            getTrailingObjects<EnumElementDecl *>());
+                            getTrailingObjects());
   }
   SourceLoc getLocFromSource() const { return CaseLoc; }
 
@@ -8822,8 +8818,8 @@ class EnumCaseDecl final : public Decl,
 
   /// Get the list of elements declared in this case.
   ArrayRef<EnumElementDecl *> getElements() const {
-    return {getTrailingObjects<EnumElementDecl *>(),
-            static_cast<size_t>(Bits.EnumCaseDecl.NumElements)};
+    return getTrailingObjects(
+        static_cast<size_t>(Bits.EnumCaseDecl.NumElements));
   }
   SourceRange getSourceRange() const;
 

include/swift/AST/Expr.h

@@ -154,12 +154,12 @@ class alignas(8) Expr : public ASTAllocated<Expr> {
     Implicit : 1
   );
 
-  SWIFT_INLINE_BITFIELD_FULL(CollectionExpr, Expr, 64-NumExprBits,
+  SWIFT_INLINE_BITFIELD_FULL(CollectionExpr, Expr, 64-NumberOfExprBits,
     /// True if the type of this collection expr was inferred by the collection
     /// fallback type, like [Any].
     IsTypeDefaulted : 1,
     /// Number of comma source locations.
-    NumCommas : 32 - 1 - NumExprBits,
+    NumCommas : 32 - 1 - NumberOfExprBits,
     /// Number of entries in the collection. If this is a DictionaryExpr,
     /// each entry is a Tuple with the key and value pair.
     NumSubExprs : 32
@@ -256,8 +256,8 @@ class alignas(8) Expr : public ASTAllocated<Expr> {
     LitKind : 3
   );
 
-  SWIFT_INLINE_BITFIELD(AbstractClosureExpr, Expr, (16-NumExprBits)+16,
-    : 16 - NumExprBits, // Align and leave room for subclasses
+  SWIFT_INLINE_BITFIELD(AbstractClosureExpr, Expr, (16-NumberOfExprBits)+16,
+    : 16 - NumberOfExprBits, // Align and leave room for subclasses
     Discriminator : 16
   );
 
@@ -3293,8 +3293,7 @@ class DestructureTupleExpr final : public ImplicitConversionExpr,
       DstExpr(dstExpr) {
     Bits.DestructureTupleExpr.NumElements = destructuredElements.size();
     std::uninitialized_copy(destructuredElements.begin(),
-                            destructuredElements.end(),
-                            getTrailingObjects<OpaqueValueExpr *>());
+                            destructuredElements.end(), getTrailingObjects());
   }
 
 public:
@@ -3306,8 +3305,8 @@ class DestructureTupleExpr final : public ImplicitConversionExpr,
          Expr *srcExpr, Expr *dstExpr, Type ty);
 
   ArrayRef<OpaqueValueExpr *> getDestructuredElements() const {
-    return {getTrailingObjects<OpaqueValueExpr *>(),
-            static_cast<size_t>(Bits.DestructureTupleExpr.NumElements)};
+    return getTrailingObjects(
+        static_cast<size_t>(Bits.DestructureTupleExpr.NumElements));
   }
 
   Expr *getResultExpr() const {
@@ -3712,7 +3711,7 @@ class UnresolvedSpecializeExpr final : public Expr,
       SubExpr(SubExpr), LAngleLoc(LAngleLoc), RAngleLoc(RAngleLoc) {
     Bits.UnresolvedSpecializeExpr.NumUnresolvedParams = UnresolvedParams.size();
     std::uninitialized_copy(UnresolvedParams.begin(), UnresolvedParams.end(),
-                            getTrailingObjects<TypeRepr *>());
+                            getTrailingObjects());
   }
 
 public:
@@ -3726,8 +3725,8 @@ class UnresolvedSpecializeExpr final : public Expr,
   /// Retrieve the list of type parameters. These parameters have not yet
   /// been bound to archetypes of the entity to be specialized.
   ArrayRef<TypeRepr *> getUnresolvedParams() const {
-    return {getTrailingObjects<TypeRepr *>(),
-            static_cast<size_t>(Bits.UnresolvedSpecializeExpr.NumUnresolvedParams)};
+    return getTrailingObjects(
+        static_cast<size_t>(Bits.UnresolvedSpecializeExpr.NumUnresolvedParams));
   }
 
   SourceLoc getLoc() const { return LAngleLoc; }
@@ -3984,7 +3983,7 @@ class SequenceExpr final : public Expr,
     Bits.SequenceExpr.NumElements = elements.size();
     assert(Bits.SequenceExpr.NumElements > 0 && "zero-length sequence!");
     std::uninitialized_copy(elements.begin(), elements.end(),
-                            getTrailingObjects<Expr*>());
+                            getTrailingObjects());
   }
 
 public:
@@ -4000,11 +3999,13 @@ class SequenceExpr final : public Expr,
   unsigned getNumElements() const { return Bits.SequenceExpr.NumElements; }
 
   MutableArrayRef<Expr*> getElements() {
-    return {getTrailingObjects<Expr*>(), static_cast<size_t>(Bits.SequenceExpr.NumElements)};
+    return getTrailingObjects(
+        static_cast<size_t>(Bits.SequenceExpr.NumElements));
   }
 
   ArrayRef<Expr*> getElements() const {
-    return {getTrailingObjects<Expr*>(), static_cast<size_t>(Bits.SequenceExpr.NumElements)};
+    return getTrailingObjects(
+        static_cast<size_t>(Bits.SequenceExpr.NumElements));
   }
 
   Expr *getElement(unsigned i) const {
@@ -4641,7 +4642,7 @@ class CaptureListExpr final : public Expr,
     assert(closureBody);
     Bits.CaptureListExpr.NumCaptures = captureList.size();
     std::uninitialized_copy(captureList.begin(), captureList.end(),
-                            getTrailingObjects<CaptureListEntry>());
+                            getTrailingObjects());
   }
 
 public:
@@ -4650,8 +4651,8 @@ class CaptureListExpr final : public Expr,
                                  AbstractClosureExpr *closureBody);
 
   ArrayRef<CaptureListEntry> getCaptureList() {
-    return {getTrailingObjects<CaptureListEntry>(),
-            static_cast<size_t>(Bits.CaptureListExpr.NumCaptures)};
+    return getTrailingObjects(
+        static_cast<size_t>(Bits.CaptureListExpr.NumCaptures));
   }
   AbstractClosureExpr *getClosureBody() { return closureBody; }
   const AbstractClosureExpr *getClosureBody() const { return closureBody; }
@@ -6591,7 +6592,7 @@ class TypeJoinExpr final : public Expr,
   }
 
   MutableArrayRef<Expr *> getMutableElements() {
-    return { getTrailingObjects<Expr *>(), getNumElements() };
+    return getTrailingObjects(getNumElements());
   }
 
   TypeJoinExpr(llvm::PointerUnion<DeclRefExpr *, TypeBase *> result,
@@ -6634,7 +6635,7 @@ class TypeJoinExpr final : public Expr,
   }
 
   ArrayRef<Expr *> getElements() const {
-    return { getTrailingObjects<Expr *>(), getNumElements() };
+    return getTrailingObjects(getNumElements());
   }
 
   Expr *getElement(unsigned i) const {