Merge pull request #71863 from bnbarham/remove-makearrayref

Use the new template deduction guides rather than `makeArrayRef`

Author: bnbarham

CMakeLists.txt

@@ -1385,14 +1385,6 @@ endif()
 add_subdirectory(include)
 
 if(SWIFT_INCLUDE_TOOLS)
-  # TODO Remove this once release/5.9 is done and we can finish migrating Swift
-  #      off of `llvm::None`/`llvm::Optional`, and `llvm::makeArrayRef`.
-  # This is to silence the avalanche of deprecation warnings from LLVM headers
-  # until we can actually do something about them. This is nasty, but it's
-  # better than losing context due to the sheer number in-actionable deprecation
-  # warnings or the massive number of merge-conflicts we would get otherwise.
-  add_definitions(-DSWIFT_TARGET)
-
   add_subdirectory(lib)
 
   add_subdirectory(SwiftCompilerSources)

include/swift/ABI/GenericContext.h

@@ -318,19 +318,19 @@ class RuntimeGenericSignature {
       PackShapeHeader(packShapeHeader), PackShapeDescriptors(packShapeDescriptors) {}
 
   llvm::ArrayRef<GenericParamDescriptor> getParams() const {
-    return llvm::makeArrayRef(Params, Header.NumParams);
+    return llvm::ArrayRef(Params, Header.NumParams);
   }
 
   llvm::ArrayRef<TargetGenericRequirementDescriptor<Runtime>> getRequirements() const {
-    return llvm::makeArrayRef(Requirements, Header.NumRequirements);
+    return llvm::ArrayRef(Requirements, Header.NumRequirements);
   }
 
   const GenericPackShapeHeader &getGenericPackShapeHeader() const {
     return PackShapeHeader;
   }
 
   llvm::ArrayRef<GenericPackShapeDescriptor> getGenericPackShapeDescriptors() const {
-    return llvm::makeArrayRef(PackShapeDescriptors, PackShapeHeader.NumPacks);
+    return llvm::ArrayRef(PackShapeDescriptors, PackShapeHeader.NumPacks);
   }
 
   size_t getArgumentLayoutSizeInWords() const {
@@ -379,20 +379,20 @@ class TargetGenericEnvironment
 public:
   /// Retrieve the cumulative generic parameter counts at each level of genericity.
   llvm::ArrayRef<uint16_t> getGenericParameterCounts() const {
-    return llvm::makeArrayRef(this->template getTrailingObjects<uint16_t>(),
-                              Flags.getNumGenericParameterLevels());
+    return llvm::ArrayRef(this->template getTrailingObjects<uint16_t>(),
+                          Flags.getNumGenericParameterLevels());
   }
 
   /// Retrieve the generic parameters descriptors.
   llvm::ArrayRef<GenericParamDescriptor> getGenericParameters() const {
-    return llvm::makeArrayRef(
+    return llvm::ArrayRef(
         this->template getTrailingObjects<GenericParamDescriptor>(),
         getGenericParameterCounts().back());
   }
 
   /// Retrieve the generic requirements.
   llvm::ArrayRef<GenericRequirementDescriptor> getGenericRequirements() const {
-    return llvm::makeArrayRef(
+    return llvm::ArrayRef(
         this->template getTrailingObjects<GenericRequirementDescriptor>(),
         Flags.getNumGenericRequirements());
   }

include/swift/AST/ASTContext.h

@@ -523,7 +523,7 @@ class ASTContext final {
   StringRef AllocateCopy(StringRef Str,
                     AllocationArena arena = AllocationArena::Permanent) const {
     ArrayRef<char> Result =
-        AllocateCopy(llvm::makeArrayRef(Str.data(), Str.size()), arena);
+        AllocateCopy(llvm::ArrayRef(Str.data(), Str.size()), arena);
     return StringRef(Result.data(), Result.size());
   }
 

include/swift/AST/CaptureInfo.h

@@ -145,8 +145,7 @@ class CaptureInfo {
       : DynamicSelf(dynamicSelf), OpaqueValue(opaqueValue), Count(count) { }
 
     ArrayRef<CapturedValue> getCaptures() const {
-      return llvm::makeArrayRef(this->getTrailingObjects<CapturedValue>(),
-                                Count);
+      return llvm::ArrayRef(this->getTrailingObjects<CapturedValue>(), Count);
     }
 
     DynamicSelfType *getDynamicSelfType() const {

include/swift/AST/Comment.h

@@ -46,7 +46,7 @@ class DocComment {
   }
 
   ArrayRef<StringRef> getTags() const {
-    return llvm::makeArrayRef(Parts.Tags.begin(), Parts.Tags.end());
+    return llvm::ArrayRef(Parts.Tags.begin(), Parts.Tags.end());
   }
 
   std::optional<const swift::markup::Paragraph *> getBrief() const {

include/swift/AST/NameLookup.h

@@ -163,16 +163,16 @@ class LookupResult {
   bool empty() const { return innerResults().empty(); }
 
   ArrayRef<LookupResultEntry> innerResults() const {
-    return llvm::makeArrayRef(Results).take_front(IndexOfFirstOuterResult);
+    return llvm::ArrayRef(Results).take_front(IndexOfFirstOuterResult);
   }
 
   ArrayRef<LookupResultEntry> outerResults() const {
-    return llvm::makeArrayRef(Results).drop_front(IndexOfFirstOuterResult);
+    return llvm::ArrayRef(Results).drop_front(IndexOfFirstOuterResult);
   }
 
   /// \returns An array of both the inner and outer results.
   ArrayRef<LookupResultEntry> allResults() const {
-    return llvm::makeArrayRef(Results);
+    return llvm::ArrayRef(Results);
   }
 
   const LookupResultEntry& operator[](unsigned index) const {

include/swift/AST/SILLayout.h

@@ -142,7 +142,7 @@ class SILLayout final : public llvm::FoldingSetNode,
 
   /// Get the fields inside the layout.
   ArrayRef<SILField> getFields() const {
-    return llvm::makeArrayRef(getTrailingObjects<SILField>(), NumFields);
+    return llvm::ArrayRef(getTrailingObjects<SILField>(), NumFields);
   }
 
   /// Produce a profile of this layout, for use in a folding set.

include/swift/AST/SourceFile.h

@@ -302,7 +302,7 @@ class SourceFile final : public FileUnit {
   std::optional<ArrayRef<ASTNode>> getCachedTopLevelItems() const {
     if (!Items)
       return std::nullopt;
-    return llvm::makeArrayRef(*Items);
+    return llvm::ArrayRef(*Items);
   }
 
   /// Retrieve the parsing options for the file.

include/swift/AST/Stmt.h

@@ -514,8 +514,7 @@ class alignas(8) PoundAvailableInfo final :
                                     bool isUnavailability);
 
   ArrayRef<AvailabilitySpec *> getQueries() const {
-    return llvm::makeArrayRef(getTrailingObjects<AvailabilitySpec *>(),
-                              NumQueries);
+    return llvm::ArrayRef(getTrailingObjects<AvailabilitySpec *>(), NumQueries);
   }
 
   SourceLoc getLParenLoc() const { return LParenLoc; }

include/swift/AST/TypeRepr.h

@@ -281,8 +281,8 @@ class AttributedTypeRepr final
                                     TypeRepr *ty);
 
   ArrayRef<TypeOrCustomAttr> getAttrs() const {
-    return llvm::makeArrayRef(getTrailingObjects<TypeOrCustomAttr>(),
-                              Bits.AttributedTypeRepr.NumAttributes);
+    return llvm::ArrayRef(getTrailingObjects<TypeOrCustomAttr>(),
+                          Bits.AttributedTypeRepr.NumAttributes);
   }
 
   TypeAttribute *get(TypeAttrKind kind) const;
@@ -871,12 +871,12 @@ class PackTypeRepr final
   SourceRange getBracesRange() const { return BraceLocs; }
 
   MutableArrayRef<TypeRepr*> getMutableElements() {
-    return llvm::makeMutableArrayRef(getTrailingObjects<TypeRepr*>(),
-                                     Bits.PackTypeRepr.NumElements);
+    return llvm::MutableArrayRef(getTrailingObjects<TypeRepr *>(),
+                                 Bits.PackTypeRepr.NumElements);
   }
   ArrayRef<TypeRepr*> getElements() const {
-    return llvm::makeArrayRef(getTrailingObjects<TypeRepr*>(),
-                              Bits.PackTypeRepr.NumElements);
+    return llvm::ArrayRef(getTrailingObjects<TypeRepr *>(),
+                          Bits.PackTypeRepr.NumElements);
   }
 
   static bool classof(const TypeRepr *T) {