Merge pull request #63187 from apple/rebranch

Merge `rebranch` into `main` to support `stable/20221013` llvm-project branch

Author: shahmishal

CMakeLists.txt

@@ -46,7 +46,7 @@ endif()
 ENABLE_LANGUAGE(C)
 
 # Use C++14.
-set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to")
+set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to conform to")
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
 set(CMAKE_CXX_EXTENSIONS NO)
 
@@ -55,6 +55,7 @@ include(SwiftUtils)
 include(CheckSymbolExists)
 include(CMakeDependentOption)
 include(CheckLanguage)
+include(GNUInstallDirs)
 
 # Enable Swift for the host compiler build if we have the language. It is
 # optional until we have a bootstrap story.
@@ -323,6 +324,10 @@ if(SWIFT_PROFDATA_FILE AND EXISTS ${SWIFT_PROFDATA_FILE})
   add_definitions("-fprofile-instr-use=${SWIFT_PROFDATA_FILE}")
 endif()
 
+set(SWIFT_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
+  "Path for binary subdirectory to use during installation.
+  Used by add_swift_tool_symlink in AddSwift.cmake so that llvm_install_symlink generates the installation script properly.")
+
 #
 # User-configurable Swift Standard Library specific options.
 #

SwiftCompilerSources/CMakeLists.txt

@@ -75,6 +75,7 @@ function(add_swift_compiler_modules_library name)
   set(swift_compile_options
       "-Xfrontend" "-validate-tbd-against-ir=none"
       "-Xfrontend" "-enable-experimental-cxx-interop"
+      "-Xcc" "-std=c++17"
       "-Xcc" "-UIBOutlet" "-Xcc" "-UIBAction" "-Xcc" "-UIBInspectable")
   if (NOT BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")
     list(APPEND swift_compile_options "-Xfrontend" "-disable-implicit-string-processing-module-import")

cmake/modules/AddSwift.cmake

@@ -976,8 +976,8 @@ function(add_swift_fuzzer_host_tool executable)
 endfunction()
 
 macro(add_swift_tool_symlink name dest component)
-  add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE)
-  llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE COMPONENT ${component})
+  llvm_add_tool_symlink(SWIFT ${name} ${dest} ALWAYS_GENERATE)
+  llvm_install_symlink(SWIFT ${name} ${dest} ALWAYS_GENERATE COMPONENT ${component})
 endmacro()
 
 # Declare that files in this library are built with LLVM's support

include/swift/AST/DeclContext.h

@@ -254,7 +254,7 @@ class alignas(1 << DeclContextAlignInBits) DeclContext
   friend class AbstractClosureExpr; // uses setParent
 
   template<class A, class B, class C>
-  friend struct ::llvm::cast_convert_val;
+  friend struct ::llvm::CastInfo;
 
   // See swift/AST/Decl.h
   static DeclContext *castDeclToDeclContext(const Decl *D);
@@ -787,7 +787,7 @@ class IterableDeclContext {
   unsigned HasNestedClassDeclarations : 1;
 
   template<class A, class B, class C>
-  friend struct ::llvm::cast_convert_val;
+  friend struct ::llvm::CastInfo;
 
   static IterableDeclContext *castDeclToIterableDeclContext(const Decl *D);
 
@@ -977,16 +977,26 @@ SourceLoc extractNearestSourceLoc(const IterableDeclContext *idc);
 
 namespace llvm {
   template<class FromTy>
-  struct cast_convert_val< ::swift::DeclContext, FromTy, FromTy> {
-    static ::swift::DeclContext *doit(const FromTy &Val) {
-      return ::swift::DeclContext::castDeclToDeclContext(Val);
+  struct CastInfo<::swift::DeclContext, FromTy, std::enable_if_t<is_simple_type<FromTy>::value>>
+      : public CastIsPossible<::swift::DeclContext, FromTy>,
+        public DefaultDoCastIfPossible<::swift::DeclContext *, FromTy,
+                                       CastInfo<::swift::DeclContext, FromTy>> {
+    static inline ::swift::DeclContext *castFailed() { return nullptr; }
+
+    static inline ::swift::DeclContext *doCast(const FromTy &val) {
+      return ::swift::DeclContext::castDeclToDeclContext(val);
     }
   };
 
   template<class FromTy>
-  struct cast_convert_val< ::swift::IterableDeclContext, FromTy, FromTy> {
-    static ::swift::IterableDeclContext *doit(const FromTy &Val) {
-      return ::swift::IterableDeclContext::castDeclToIterableDeclContext(Val);
+  struct CastInfo<::swift::IterableDeclContext, FromTy, std::enable_if_t<is_simple_type<FromTy>::value>>
+      : public CastIsPossible<::swift::IterableDeclContext, FromTy>,
+        public DefaultDoCastIfPossible<::swift::IterableDeclContext *, FromTy,
+                                       CastInfo<::swift::IterableDeclContext, FromTy>> {
+    static inline ::swift::IterableDeclContext *castFailed() { return nullptr; }
+
+    static inline ::swift::IterableDeclContext *doCast(const FromTy &val) {
+      return ::swift::IterableDeclContext::castDeclToIterableDeclContext(val);
     }
   };
 }

include/swift/AST/ExtInfo.h

@@ -412,46 +412,46 @@ class ASTExtInfoBuilder {
 
   // Note that we don't have setters. That is by design, use
   // the following with methods instead of mutating these objects.
-  LLVM_NODISCARD
+  [[nodiscard]]
   ASTExtInfoBuilder withRepresentation(Representation rep) const {
     return ASTExtInfoBuilder((bits & ~RepresentationMask) | (unsigned)rep,
                              shouldStoreClangType(rep) ? clangTypeInfo
                                                        : ClangTypeInfo(),
                              globalActor);
   }
-  LLVM_NODISCARD
+  [[nodiscard]]
   ASTExtInfoBuilder withNoEscape(bool noEscape = true) const {
     return ASTExtInfoBuilder(noEscape ? (bits | NoEscapeMask)
                                       : (bits & ~NoEscapeMask),
                              clangTypeInfo, globalActor);
   }
-  LLVM_NODISCARD
+  [[nodiscard]]
   ASTExtInfoBuilder withConcurrent(bool concurrent = true) const {
     return ASTExtInfoBuilder(concurrent ? (bits | SendableMask)
                                         : (bits & ~SendableMask),
                              clangTypeInfo, globalActor);
   }
-  LLVM_NODISCARD
+  [[nodiscard]]
   ASTExtInfoBuilder withAsync(bool async = true) const {
     return ASTExtInfoBuilder(async ? (bits | AsyncMask)
                                    : (bits & ~AsyncMask),
                              clangTypeInfo, globalActor);
   }
-  LLVM_NODISCARD
+  [[nodiscard]]
   ASTExtInfoBuilder withThrows(bool throws = true) const {
     return ASTExtInfoBuilder(
         throws ? (bits | ThrowsMask) : (bits & ~ThrowsMask), clangTypeInfo,
         globalActor);
   }
-  LLVM_NODISCARD
+  [[nodiscard]]
   ASTExtInfoBuilder
   withDifferentiabilityKind(DifferentiabilityKind differentiability) const {
     return ASTExtInfoBuilder(
         (bits & ~DifferentiabilityMask) |
             ((unsigned)differentiability << DifferentiabilityMaskOffset),
         clangTypeInfo, globalActor);
   }
-  LLVM_NODISCARD
+  [[nodiscard]]
   ASTExtInfoBuilder withClangFunctionType(const clang::Type *type) const {
     return ASTExtInfoBuilder(bits, ClangTypeInfo(type), globalActor);
   }
@@ -461,7 +461,7 @@ class ASTExtInfoBuilder {
   /// SIL type lowering transiently generates AST function types with SIL
   /// representations. However, they shouldn't persist in the AST, and
   /// don't need to be parsed, printed, or serialized.
-  LLVM_NODISCARD
+  [[nodiscard]]
   ASTExtInfoBuilder
   withSILRepresentation(SILFunctionTypeRepresentation rep) const {
     return ASTExtInfoBuilder((bits & ~RepresentationMask) | (unsigned)rep,
@@ -470,7 +470,7 @@ class ASTExtInfoBuilder {
                              globalActor);
   }
 
-  LLVM_NODISCARD
+  [[nodiscard]]
   ASTExtInfoBuilder withGlobalActor(Type globalActor) const {
     return ASTExtInfoBuilder(bits, clangTypeInfo, globalActor);
   }
@@ -555,44 +555,44 @@ class ASTExtInfo {
   /// Helper method for changing the representation.
   ///
   /// Prefer using \c ASTExtInfoBuilder::withRepresentation for chaining.
-  LLVM_NODISCARD
+  [[nodiscard]]
   ASTExtInfo withRepresentation(ASTExtInfoBuilder::Representation rep) const {
     return builder.withRepresentation(rep).build();
   }
 
   /// Helper method for changing only the noEscape field.
   ///
   /// Prefer using \c ASTExtInfoBuilder::withNoEscape for chaining.
-  LLVM_NODISCARD
+  [[nodiscard]]
   ASTExtInfo withNoEscape(bool noEscape = true) const {
     return builder.withNoEscape(noEscape).build();
   }
 
   /// Helper method for changing only the concurrent field.
   ///
   /// Prefer using \c ASTExtInfoBuilder::withConcurrent for chaining.
-  LLVM_NODISCARD
+  [[nodiscard]]
   ASTExtInfo withConcurrent(bool concurrent = true) const {
     return builder.withConcurrent(concurrent).build();
   }
 
   /// Helper method for changing only the throws field.
   ///
   /// Prefer using \c ASTExtInfoBuilder::withThrows for chaining.
-  LLVM_NODISCARD
+  [[nodiscard]]
   ASTExtInfo withThrows(bool throws = true) const {
     return builder.withThrows(throws).build();
   }
 
   /// Helper method for changing only the async field.
   ///
   /// Prefer using \c ASTExtInfoBuilder::withAsync for chaining.
-  LLVM_NODISCARD
+  [[nodiscard]]
   ASTExtInfo withAsync(bool async = true) const {
     return builder.withAsync(async).build();
   }
 
-  LLVM_NODISCARD
+  [[nodiscard]]
   ASTExtInfo withGlobalActor(Type globalActor) const {
     return builder.withGlobalActor(globalActor).build();
   }
@@ -785,44 +785,44 @@ class SILExtInfoBuilder {
 
   // Note that we don't have setters. That is by design, use
   // the following with methods instead of mutating these objects.
-  LLVM_NODISCARD
+  [[nodiscard]]
   SILExtInfoBuilder withRepresentation(Representation rep) const {
     return SILExtInfoBuilder((bits & ~RepresentationMask) | (unsigned)rep,
                              shouldStoreClangType(rep) ? clangTypeInfo
                                                        : ClangTypeInfo());
   }
-  LLVM_NODISCARD
+  [[nodiscard]]
   SILExtInfoBuilder withIsPseudogeneric(bool isPseudogeneric = true) const {
     return SILExtInfoBuilder(isPseudogeneric ? (bits | PseudogenericMask)
                                              : (bits & ~PseudogenericMask),
                              clangTypeInfo);
   }
-  LLVM_NODISCARD
+  [[nodiscard]]
   SILExtInfoBuilder withNoEscape(bool noEscape = true) const {
     return SILExtInfoBuilder(noEscape ? (bits | NoEscapeMask)
                                       : (bits & ~NoEscapeMask),
                              clangTypeInfo);
   }
-  LLVM_NODISCARD
+  [[nodiscard]]
   SILExtInfoBuilder withConcurrent(bool isSendable = true) const {
     return SILExtInfoBuilder(isSendable ? (bits | SendableMask)
                                           : (bits & ~SendableMask),
                              clangTypeInfo);
   }
-  LLVM_NODISCARD
+  [[nodiscard]]
   SILExtInfoBuilder withAsync(bool isAsync = true) const {
     return SILExtInfoBuilder(isAsync ? (bits | AsyncMask) : (bits & ~AsyncMask),
                              clangTypeInfo);
   }
-  LLVM_NODISCARD
+  [[nodiscard]]
   SILExtInfoBuilder
   withDifferentiabilityKind(DifferentiabilityKind differentiability) const {
     return SILExtInfoBuilder(
         (bits & ~DifferentiabilityMask) |
             ((unsigned)differentiability << DifferentiabilityMaskOffset),
         clangTypeInfo);
   }
-  LLVM_NODISCARD
+  [[nodiscard]]
   SILExtInfoBuilder withClangFunctionType(const clang::Type *type) const {
     return SILExtInfoBuilder(bits, ClangTypeInfo(type).getCanonical());
   }

include/swift/AST/IRGenOptions.h

@@ -252,9 +252,6 @@ class IRGenOptions {
   /// well-formed?
   unsigned Verify : 1;
 
-  /// Should we use the legacy pass manager.
-  unsigned LegacyPassManager : 1;
-
   OptimizationMode OptMode;
 
   /// Which sanitizer is turned on.
@@ -474,7 +471,7 @@ class IRGenOptions {
   IRGenOptions()
       : DWARFVersion(2),
         OutputKind(IRGenOutputKind::LLVMAssemblyAfterOptimization),
-        Verify(true), LegacyPassManager(0), OptMode(OptimizationMode::NotSet),
+        Verify(true), OptMode(OptimizationMode::NotSet),
         Sanitizers(OptionSet<SanitizerKind>()),
         SanitizersWithRecoveryInstrumentation(OptionSet<SanitizerKind>()),
         SanitizeAddressUseODRIndicator(false),

include/swift/AST/IRGenRequests.h

@@ -150,6 +150,7 @@ struct IRGenDescriptor {
   StringRef PrivateDiscriminator;
   ArrayRef<std::string> parallelOutputFilenames;
   llvm::GlobalVariable **outModuleHash;
+  llvm::raw_pwrite_stream *out = nullptr;
 
   friend llvm::hash_code hash_value(const IRGenDescriptor &owner) {
     return llvm::hash_combine(owner.Ctx, owner.SymbolsToEmit, owner.SILMod);

include/swift/Basic/BasicBridging.h

@@ -13,6 +13,10 @@
 #ifndef SWIFT_BASIC_BASICBRIDGING_H
 #define SWIFT_BASIC_BASICBRIDGING_H
 
+// Workaround to avoid a compiler error because `cas::ObjectRef` is not defined
+// when including VirtualFileSystem.h
+#include "llvm/CAS/CASReference.h"
+
 #include "swift/Basic/BridgedSwiftObject.h"
 #include "swift/Basic/SourceLoc.h"
 #include <stddef.h>

include/swift/Basic/RelativePointer.h

@@ -551,7 +551,7 @@ class RelativeDirectPointer<T, Nullable, Offset,
   }
 
   template <typename... ArgTy>
-  typename std::result_of<T *(ArgTy...)>::type operator()(ArgTy... arg) const {
+  typename std::invoke_result<T*, ArgTy...>::type operator()(ArgTy... arg) const {
 #if SWIFT_PTRAUTH
     void *ptr = this->super::getWithoutCast();
     return reinterpret_cast<T *>(ptrauth_sign_unauthenticated(

include/swift/Basic/STLExtras.h

@@ -405,7 +405,7 @@ class OptionalTransformIterator {
       typename std::iterator_traits<Iterator>::reference;
 
   using ResultReference =
-      typename std::result_of<OptionalTransform(UnderlyingReference)>::type;
+      typename std::invoke_result<OptionalTransform, UnderlyingReference>::type;
 
 public:
   /// Used to indicate when the current iterator has already been