Merge branch 'main' into sdkrelative

Author: rmaz

.github/CODEOWNERS

@@ -55,7 +55,7 @@
 /docs/Windows*                            @compnerd
 
 # include
-/include/swift-c/DependencyScan/                   @artemcm
+/include/swift-c/DependencyScan/                   @artemcm @cachemeifyoucan
 /include/swift/*Demangl*/                          @rjmccall
 /include/swift/AST/                                @hborla @slavapestov @xedin
 /include/swift/AST/*Availability*                  @tshortli
@@ -71,7 +71,7 @@
 /include/swift/Basic/                              @DougGregor
 /include/swift/Basic/Features.def                  @DougGregor @hborla
 /include/swift/ClangImporter                       @zoecarver @hyp @egorzhdan @beccadax @ian-twilightcoder @Xazax-hun
-/include/swift/DependencyScan                      @artemcm
+/include/swift/DependencyScan                      @artemcm @cachemeifyoucan
 /include/swift/Driver*/                            @artemcm
 /include/swift/Frontend*/                          @artemcm @tshortli
 /include/swift/IDE/                                @ahoppen @bnbarham @hamishknight @rintaro
@@ -118,7 +118,7 @@
 /lib/Basic/Windows                                  @compnerd
 /lib/ClangImporter                                  @zoecarver @hyp @egorzhdan @beccadax @ian-twilightcoder @Xazax-hun
 /lib/ClangImporter/DWARFImporter*                   @adrian-prantl
-/lib/DependencyScan                                 @artemcm
+/lib/DependencyScan                                 @artemcm @cachemeifyoucan
 /lib/Driver*/                                       @artemcm
 /lib/DriverTool/autolink_extract_main.cpp           @MaxDesiatov @etcwilde
 /lib/DriverTool/sil*                                @jckarter
@@ -247,7 +247,7 @@
 /unittests/*Demangl*/                     @rjmccall
 /unittests/AST/                           @hborla @slavapestov @xedin
 /unittests/AST/*Evaluator*                @CodaFi @slavapestov
-/unittests/DependencyScan/                @artemcm
+/unittests/DependencyScan/                @artemcm @cachemeifyoucan
 /unittests/FrontendTool/                  @artemcm @tshortli
 /unittests/Parse/                         @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
 /unittests/Reflection/                    @slavapestov

.gitignore

@@ -52,6 +52,7 @@ docs/_build
 
 # SwiftPM
 .build
+.index-build
 .swiftpm
 
 #==============================================================================#

Runtimes/Core/core/CMakeLists.txt

@@ -284,7 +284,6 @@ target_compile_options(swiftCore PRIVATE
   "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature FreestandingMacros>"
   "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature BitwiseCopyable>"
   "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature Extern>"
-  "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature DebugDescriptionMacro>"
   "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -group-info-path -Xfrontend ${CMAKE_CURRENT_SOURCE_DIR}/GroupInfo.json>"
   "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -enable-experimental-concise-pound-file>"
   "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolinking-runtime-compatibility-concurrency>"

cmake/caches/Windows-aarch64.cmake

@@ -50,7 +50,7 @@ set(LLVM_TARGETS_TO_BUILD AArch64 ARM WebAssembly X86 CACHE STRING "")
 set(LLVM_BUILD_LLVM_DYLIB NO CACHE BOOL "")
 set(LLVM_BUILD_LLVM_C_DYLIB NO CACHE BOOL "")
 set(LLVM_ENABLE_LIBEDIT NO CACHE BOOL "")
-set(LLVM_ENABLE_LIBXML2 NO CACHE BOOL "")
+set(LLVM_ENABLE_LIBXML2 YES CACHE BOOL "")
 set(LLVM_ENABLE_OCAMLDOC NO CACHE BOOL "")
 set(LLVM_ENABLE_TERMINFO NO CACHE BOOL "")
 set(LLVM_ENABLE_Z3_SOLVER NO CACHE BOOL "")
@@ -62,12 +62,14 @@ set(LLVM_INCLUDE_GO_TESTS NO CACHE BOOL "")
 set(LLVM_TOOL_GOLD_BUILD NO CACHE BOOL "")
 set(LLVM_TOOL_LLVM_SHLIB_BUILD NO CACHE BOOL "")
 
+set(CLANG_ENABLE_LIBXML2 NO CACHE BOOL "")
+
 # Avoid swig dependency for lldb
 set(LLDB_ALLOW_STATIC_BINDINGS YES CACHE BOOL "")
 set(LLDB_USE_STATIC_BINDINGS YES CACHE BOOL "")
 set(LLDB_ENABLE_PYTHON YES CACHE BOOL "")
 set(LLDB_EMBED_PYTHON_HOME NO CACHE BOOL "")
-set(LLDB_ENABLE_LIBXML2 NO CACHE BOOL "")
+set(LLDB_ENABLE_LIBXML2 YES CACHE BOOL "")
 
 # This requires perl which may not be available on Windows
 set(SWIFT_INCLUDE_DOCS NO CACHE BOOL "")

cmake/caches/Windows-x86_64.cmake

@@ -90,7 +90,7 @@ set(LLVM_TARGETS_TO_BUILD AArch64 ARM WebAssembly X86 CACHE STRING "")
 set(LLVM_BUILD_LLVM_DYLIB NO CACHE BOOL "")
 set(LLVM_BUILD_LLVM_C_DYLIB NO CACHE BOOL "")
 set(LLVM_ENABLE_LIBEDIT NO CACHE BOOL "")
-set(LLVM_ENABLE_LIBXML2 NO CACHE BOOL "")
+set(LLVM_ENABLE_LIBXML2 YES CACHE BOOL "")
 set(LLVM_ENABLE_OCAMLDOC NO CACHE BOOL "")
 set(LLVM_ENABLE_TERMINFO NO CACHE BOOL "")
 set(LLVM_ENABLE_Z3_SOLVER NO CACHE BOOL "")
@@ -102,12 +102,14 @@ set(LLVM_INCLUDE_GO_TESTS NO CACHE BOOL "")
 set(LLVM_TOOL_GOLD_BUILD NO CACHE BOOL "")
 set(LLVM_TOOL_LLVM_SHLIB_BUILD NO CACHE BOOL "")
 
+set(CLANG_ENABLE_LIBXML2 NO CACHE BOOL "")
+
 # Avoid swig dependency for lldb
 set(LLDB_ALLOW_STATIC_BINDINGS YES CACHE BOOL "")
 set(LLDB_USE_STATIC_BINDINGS YES CACHE BOOL "")
 set(LLDB_ENABLE_PYTHON YES CACHE BOOL "")
 set(LLDB_EMBED_PYTHON_HOME NO CACHE BOOL "")
-set(LLDB_ENABLE_LIBXML2 NO CACHE BOOL "")
+set(LLDB_ENABLE_LIBXML2 YES CACHE BOOL "")
 
 # This requires perl which may not be available on Windows
 set(SWIFT_INCLUDE_DOCS NO CACHE BOOL "")

cmake/modules/DarwinSDKs.cmake

@@ -3,7 +3,7 @@ set(SUPPORTED_IOS_SIMULATOR_ARCHS "x86_64;arm64")
 set(SUPPORTED_TVOS_ARCHS "arm64")
 set(SUPPORTED_TVOS_SIMULATOR_ARCHS "x86_64;arm64")
 set(SUPPORTED_WATCHOS_ARCHS "armv7k;arm64_32")
-set(SUPPORTED_WATCHOS_SIMULATOR_ARCHS "x86_64;arm64")
+set(SUPPORTED_WATCHOS_SIMULATOR_ARCHS "i386;x86_64;arm64")
 set(SUPPORTED_OSX_ARCHS "x86_64;arm64")
 set(SUPPORTED_XROS_ARCHS "arm64;arm64e")
 set(SUPPORTED_XROS_SIMULATOR_ARCHS "arm64")

cmake/modules/SwiftConfigureSDK.cmake

@@ -91,6 +91,10 @@ function(remove_sdk_unsupported_archs name os sdk_path deployment_version archit
       # 32-bit watchOS is not listed explicitly in SDK settings.
       message(STATUS "Assuming ${name} SDK at ${sdk_path} supports architecture ${arch}")
       list(APPEND architectures ${arch})
+    elseif(arch STREQUAL "i386" AND os STREQUAL "watchsimulator")
+      # 32-bit watchOS simulator is not listed explicitly in SDK settings.
+      message(STATUS "Assuming ${name} SDK at ${sdk_path} supports architecture ${arch}")
+      list(APPEND architectures ${arch})
     else()
       message(STATUS "${name} SDK at ${sdk_path} does not support architecture ${arch}")
     endif()

docs/Testing.md

@@ -298,14 +298,6 @@ code for the target that is not the build machine:
 
   Add ``REQUIRES: executable_test`` to the test.
 
-* ``%target-run-simple-swift``: build a one-file Swift program and run it on
-  the target machine.
-
-  Use this substitution for executable tests that don't require special
-  compiler arguments.
-
-  Add ``REQUIRES: executable_test`` to the test.
-
 * ``%target-run-stdlib-swift``: like ``%target-run-simple-swift`` with
   ``-parse-stdlib -Xfrontend -disable-access-control``.
 

include/swift/AST/ASTMangler.h

@@ -45,9 +45,7 @@ enum class DestructorKind {
 /// The mangler for AST declarations.
 class ASTMangler : public Mangler {
 protected:
-#if 0 // STAGING
   const ASTContext &Context;
-#endif
   ModuleDecl *Mod = nullptr;
 
   /// Optimize out protocol names if a type only conforms to one protocol.
@@ -189,19 +187,6 @@ class ASTMangler : public Mangler {
     HasSymbolQuery,
   };
 
-  // STAGING: legacy constructor for LLDB
-  /// lldb overrides the defaulted argument to 'true'.
-  ASTMangler(bool DWARFMangling = false) {
-    if (DWARFMangling) {
-      DWARFMangling = true;
-      RespectOriginallyDefinedIn = false;
-    }
-  }
-
-  /// lldb overrides the defaulted argument to 'true'.
-  ASTMangler(const ASTContext &Ctx, bool DWARFMangling = false) : ASTMangler(DWARFMangling) {}
-
-#if 0
   /// lldb overrides the defaulted argument to 'true'.
   ASTMangler(const ASTContext &Ctx, bool DWARFMangling = false) : Context(Ctx) {
     if (DWARFMangling) {
@@ -214,7 +199,6 @@ class ASTMangler : public Mangler {
   }
 
   const ASTContext &getASTContext() { return Context; }
-#endif
 
   void addTypeSubstitution(Type type, GenericSignature sig) {
     type = dropProtocolsFromAssociatedTypes(type, sig);

include/swift/AST/Attr.h

@@ -508,13 +508,17 @@ class DeclAttribute : public AttributeBase {
 
   /// Create a copy of this attribute.
   DeclAttribute *clone(ASTContext &ctx) const;
+
+  /// Determine whether we can clone this attribute.
+  bool canClone() const;
 };
 
 #define UNIMPLEMENTED_CLONE(AttrType)    \
 AttrType *clone(ASTContext &ctx) const { \
     llvm_unreachable("unimplemented");   \
     return nullptr;                      \
-  }
+  }                                      \
+bool canClone() const { return false; }
 
 /// Describes a "simple" declaration attribute that carries no data.
 template<DeclAttrKind Kind>
@@ -1916,9 +1920,13 @@ class CustomAttr final : public DeclAttribute {
 
   /// Create a copy of this attribute.
   CustomAttr *clone(ASTContext &ctx) const {
+    assert(argList == nullptr &&
+           "Cannot clone custom attribute with an argument list");
     return create(ctx, AtLoc, getTypeExpr(), initContext, argList, isImplicit());
   }
 
+  bool canClone() const { return argList == nullptr; }
+
 private:
   friend class CustomAttrNominalRequest;
   void resetTypeInformation(TypeExpr *repr);