Manually merge remote-tracking branch 'origin/main' into rebranch

Conflicts:
lib/AST/RequirementMachine/RequirementLowering.cpp

Author: AnthonyLatsis

Runtimes/Core/CMakeLists.txt

@@ -104,7 +104,6 @@ defaulted_option(SwiftCore_ENABLE_OBJC_INTEROP "Enable runtime ObjC interop")
 defaulted_option(SwiftCore_ENABLE_TYPE_PRINTING "Enable printing type names")
 defaulted_option(SwiftCore_ENABLE_VECTOR_TYPES "Enable vector support")
 defaulted_option(SwiftCore_ENABLE_REFLECTION "Enable runtime support for mirrors and reflection support")
-defaulted_option(SwiftCore_ENABLE_COMMANDLINE_SUPPORT "Enable command line argument support")
 defaulted_option(SwiftCore_ENABLE_RUNTIME_FUNCTION_COUNTERS "Enable runtime function counter support")
 defaulted_option(SwiftCore_ENABLE_STDIN "Enable functions that use stdin support")
 defaulted_option(SwiftCore_ENABLE_ENVIRONMENT "Enable environment variable support")
@@ -116,6 +115,7 @@ defaulted_option(SwiftCore_ENABLE_BACKDEPLOYMENT_SUPPORT "Add symbols for runtim
 defaulted_option(SwiftCore_ENABLE_STDLIB_TRACING "Enable tracing in the runtime. Assumes the presence of os_log(3) and the os_signpost(3) API.")
 defaulted_option(SwiftCore_ENABLE_CONCURRENCY "Enable Concurrency runtime support")
 defaulted_set(SwiftCore_CONCURRENCY_GLOBAL_EXECUTOR STRING "Default Concurrency global executor implementation")
+option(SwiftCore_ENABLE_COMMANDLINE_SUPPORT "Enable command line argument support" ON)
 option(SwiftCore_ENABLE_UNICODE_DATA "Include unicode data in Swift runtimes" ON)
 option(SwiftCore_ENABLE_SHORT_MANGLING_LOOKUPS "Build with fast-path context descriptor lookups based on well-known short manglings." ON)
 option(SwiftCore_ENABLE_FILESYSTEM_SUPPORT "Build for systems that have a filesystem" ON)

Runtimes/Core/CommandLineSupport/CMakeLists.txt

@@ -5,6 +5,8 @@ if(SwiftCore_ENABLE_COMMANDLINE_SUPPORT)
     "${PROJECT_BINARY_DIR}/include")
   target_compile_definitions(swiftCommandLineSupport PUBLIC
     -DSWIFT_STDLIB_HAS_COMMANDLINE)
+  target_compile_definitions(swiftCommandLineSupport PRIVATE
+    $<$<BOOL:${BUILD_SHARED_LIBS}>:-DswiftCore_EXPORTS>)
 
   target_link_libraries(swiftCommandLineSupport PRIVATE
     swiftShims)

Runtimes/Core/cmake/modules/DefaultSettings.cmake

@@ -6,7 +6,6 @@
 # the variable with `-DSwiftCore_*` on the commandline.
 
 set(SwiftCore_ENABLE_BACKTRACING_default OFF) # TODO: enable this by default
-set(SwiftCore_ENABLE_COMMANDLINE_SUPPORT_default OFF) # TODO: enable this by default
 
 set(SwiftCore_ENABLE_STDIN_default ON)
 set(SwiftCore_ENABLE_TYPE_PRINTING_default ON)
@@ -62,12 +61,19 @@ elseif(LINUX OR ANDROID OR BSD)
   set(SwiftCore_CONCURRENCY_GLOBAL_EXECUTOR_default "dispatch")
 elseif(WIN32)
   set(SwiftCore_OBJECT_FORMAT_default "coff")
+
+  set(SwiftCore_ENABLE_LIBRARY_EVOLUTION_default ${BUILD_SHARED_LIBS})
   set(SwiftCore_ENABLE_REFLECTION_default ON)
   set(SwiftCore_ENABLE_FATALERROR_BACKTRACE_default ON)
+  set(SwiftCore_ENABLE_OVERRIDABLE_RETAIN_RELEASE_default ON)
   set(SwiftCore_ENABLE_CONCURRENCY_default NO)
   set(SwiftCore_THREADING_PACKAGE_default "WIN32")
   set(SwiftCore_ENABLE_PRESPECIALIZATION_default ON)
   set(SwiftCore_CONCURRENCY_GLOBAL_EXECUTOR_default "dispatch")
+
+  set(SwiftCore_ENABLE_VECTOR_TYPES_default ON)
+  set(SwiftCore_ENABLE_FILESYSTEM_SUPPORT_default ON)
+  set(SwiftCore_INSTALL_NESTED_SUBDIR_default ON)
 endif()
 
 include("${SwiftCore_VENDOR_MODULE_DIR}/DefaultSettings.cmake" OPTIONAL)

include/swift/AST/Decl.h

@@ -2523,9 +2523,7 @@ class PatternBindingDecl final : public Decl,
                                                Pattern *Pat, Expr *E,
                                                DeclContext *Parent);
 
-  SourceLoc getStartLoc() const {
-    return StaticLoc.isValid() ? StaticLoc : VarLoc;
-  }
+  SourceLoc getStartLoc() const;
   SourceRange getSourceRange() const;
 
   unsigned getNumPatternEntries() const {
@@ -6997,6 +6995,10 @@ class ParamDecl : public VarDecl {
   /// Create a an identical copy of this ParamDecl.
   static ParamDecl *clone(const ASTContext &Ctx, ParamDecl *PD);
 
+  static ParamDecl *cloneAccessor(const ASTContext &Ctx,
+                                  ParamDecl const *subscriptParam,
+                                  DeclContext *Parent);
+
   static ParamDecl *
   createImplicit(ASTContext &Context, SourceLoc specifierLoc,
                  SourceLoc argumentNameLoc, Identifier argumentName,
@@ -8413,9 +8415,8 @@ class FuncDecl : public AbstractFunctionDecl {
   SourceLoc getStaticLoc() const { return StaticLoc; }
   SourceLoc getFuncLoc() const { return FuncLoc; }
 
-  SourceLoc getStartLoc() const {
-    return StaticLoc.isValid() ? StaticLoc : FuncLoc;
-  }
+  SourceLoc getStartLoc() const;
+  SourceLoc getEndLoc() const;
   SourceRange getSourceRange() const;
 
   TypeRepr *getResultTypeRepr() const { return FnRetType.getTypeRepr(); }

include/swift/AST/DiagnosticsFrontend.def

@@ -520,7 +520,7 @@ REMARK(matching_output_produced,none,
 
 // Caching related diagnostics
 ERROR(error_caching_no_cas_fs, none,
-    "caching is enabled without -cas-fs option, input is not immutable", ())
+    "caching is enabled without CAS file-system options, input is not immutable", ())
 ERROR(error_prefix_mapping, none, "cannot create scanner prefix mapping: '%0'", (StringRef))
 
 REMARK(replay_output, none, "replay output file '%0': key '%1'", (StringRef, StringRef))

include/swift/AST/ModuleDependencies.h

@@ -1000,7 +1000,7 @@ using ModuleDependenciesKindMap =
 /// Track swift dependency
 class SwiftDependencyTracker {
 public:
-  SwiftDependencyTracker(llvm::cas::CachingOnDiskFileSystem &FS,
+  SwiftDependencyTracker(std::shared_ptr<llvm::cas::ObjectStore> CAS,
                          llvm::PrefixMapper *Mapper,
                          const CompilerInvocation &CI);
 
@@ -1009,7 +1009,8 @@ class SwiftDependencyTracker {
   llvm::Expected<llvm::cas::ObjectProxy> createTreeFromDependencies();
 
 private:
-  llvm::IntrusiveRefCntPtr<llvm::cas::CachingOnDiskFileSystem> FS;
+  llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FS;
+  std::shared_ptr<llvm::cas::ObjectStore> CAS;
   llvm::PrefixMapper *Mapper;
 
   struct FileEntry {
@@ -1035,10 +1036,7 @@ class SwiftDependencyScanningService {
       ClangScanningService;
 
   /// CachingOnDiskFileSystem for dependency tracking.
-  llvm::IntrusiveRefCntPtr<llvm::cas::CachingOnDiskFileSystem> CacheFS;
-
-  /// If use clang include tree.
-  bool UseClangIncludeTree = false;
+  llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> CacheFS;
 
   /// CAS Instance.
   std::shared_ptr<llvm::cas::ObjectStore> CAS;
@@ -1076,8 +1074,8 @@ class SwiftDependencyScanningService {
     return *SharedFilesystemCache;
   }
 
-  llvm::cas::CachingOnDiskFileSystem &getSharedCachingFS() const {
-    assert(CacheFS && "Expect CachingOnDiskFileSystem");
+  llvm::vfs::FileSystem &getSharedCachingFS() const {
+    assert(CacheFS && "Expect a CASFileSystem");
     return *CacheFS;
   }
 
@@ -1088,20 +1086,17 @@ class SwiftDependencyScanningService {
 
   std::optional<SwiftDependencyTracker>
   createSwiftDependencyTracker(const CompilerInvocation &CI) {
-    if (!CacheFS)
+    if (!CAS)
       return std::nullopt;
 
-    return SwiftDependencyTracker(*CacheFS, Mapper.get(), CI);
+    return SwiftDependencyTracker(CAS, Mapper.get(), CI);
   }
 
   llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> getClangScanningFS() const {
-    if (UseClangIncludeTree)
+    if (CAS)
       return llvm::cas::createCASProvidingFileSystem(
           CAS, llvm::vfs::createPhysicalFileSystem());
 
-    if (CacheFS)
-      return CacheFS->createProxyFS();
-
     return llvm::vfs::createPhysicalFileSystem();
   }
 

include/swift/Basic/CASOptions.h

@@ -37,9 +37,6 @@ class CASOptions final {
   /// CASOptions
   clang::CASOptions CASOpts;
 
-  /// CASFS Root.
-  std::vector<std::string> CASFSRootIDs;
-
   /// Clang Include Trees.
   std::string ClangIncludeTree;
 
@@ -62,9 +59,8 @@ class CASOptions final {
   /// Check to see if a CASFileSystem is required.
   bool requireCASFS() const {
     return EnableCaching &&
-           (!CASFSRootIDs.empty() || !ClangIncludeTree.empty() ||
-            !ClangIncludeTreeFileList.empty() || !InputFileKey.empty() ||
-            !BridgingHeaderPCHCacheKey.empty());
+           (!ClangIncludeTree.empty() || !ClangIncludeTreeFileList.empty() ||
+            !InputFileKey.empty() || !BridgingHeaderPCHCacheKey.empty());
   }
 
   /// Return a hash code of any components from these options that should

include/swift/Basic/LangOptions.h

@@ -1094,12 +1094,6 @@ namespace swift {
     /// built and provided to the compiler invocation.
     bool DisableImplicitClangModules = false;
 
-    /// Enable ClangIncludeTree for explicit module builds scanning.
-    bool UseClangIncludeTree = false;
-
-    /// Using ClangIncludeTreeRoot for compilation.
-    bool HasClangIncludeTreeRoot = false;
-
     /// Whether the dependency scanner should construct all swift-frontend
     /// invocations directly from clang cc1 args.
     bool ClangImporterDirectCC1Scan = false;

include/swift/ClangImporter/ClangImporter.h

@@ -474,11 +474,6 @@ class ClangImporter final : public ClangModuleLoader {
   /// Reads the original source file name from PCH.
   std::string getOriginalSourceFile(StringRef PCHFilename);
 
-  /// Add clang dependency file names.
-  ///
-  /// \param files The list of file to append dependencies to.
-  void addClangInvovcationDependencies(std::vector<std::string> &files);
-
   /// Makes a temporary replica of the ClangImporter's CompilerInstance, reads a
   /// module map into the replica and emits a PCM file for one of the modules it
   /// declares. Delegates to clang for everything except construction of the

include/swift/Frontend/CachingUtils.h

@@ -70,7 +70,7 @@ std::unique_ptr<llvm::MemoryBuffer> loadCachedCompileResultFromCacheKey(
     llvm::StringRef Filename = "");
 
 llvm::Expected<llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem>>
-createCASFileSystem(llvm::cas::ObjectStore &CAS, ArrayRef<std::string> FSRoots,
+createCASFileSystem(llvm::cas::ObjectStore &CAS,
                     const std::string &IncludeTreeRoot,
                     const std::string &IncludeTreeFileList);