Merge remote-tracking branch 'origin/main' into rebranch

Author: swift-ci

lib/SIL/IR/SILArgument.cpp

@@ -37,6 +37,7 @@ SILArgument::SILArgument(ValueKind subClassKind,
   sharedUInt8().SILArgument.reborrow = reborrow;
   sharedUInt8().SILArgument.pointerEscape = pointerEscape;
   inputParentBlock->insertArgument(inputParentBlock->args_end(), this);
+  ASSERT(!type.hasTypeParameter());
 }
 
 SILFunction *SILArgument::getFunction() {

lib/SILGen/SILGenEpilog.cpp

@@ -83,10 +83,12 @@ void SILGenFunction::prepareEpilog(
 void SILGenFunction::prepareRethrowEpilog(
     DeclContext *dc, AbstractionPattern origErrorType, Type errorType,
     CleanupLocation cleanupLoc) {
+  ASSERT(!errorType->hasPrimaryArchetype());
 
   SILBasicBlock *rethrowBB = createBasicBlock(FunctionSection::Postmatter);
   if (!IndirectErrorResult) {
-    SILType loweredErrorType = getLoweredType(origErrorType, errorType);
+    auto errorTypeInContext = dc->mapTypeIntoContext(errorType);
+    SILType loweredErrorType = getLoweredType(origErrorType, errorTypeInContext);
     rethrowBB->createPhiArgument(loweredErrorType, OwnershipKind::Owned);
   }
 

stdlib/public/Distributed/CMakeLists.txt

@@ -16,6 +16,15 @@ else()
 set(swift_distributed_darwin_dependencies)
 endif()
 
+if((SWIFT_BUILD_CLANG_OVERLAYS
+    OR SWIFT_BUILD_TEST_SUPPORT_MODULES)
+   AND (NOT DEFINED SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT
+        OR NOT SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT))
+set(swift_distributed_dependencies _Builtin_float)
+else()
+set(swift_distributed_dependencies)
+endif()
+
 set(swift_distributed_link_libraries
   swiftCore)
 
@@ -30,6 +39,7 @@ add_swift_target_library(swiftDistributed ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS
   DistributedMetadata.swift
   LocalTestingDistributedActorSystem.swift
 
+  SWIFT_MODULE_DEPENDS ${swift_distributed_dependencies}
   SWIFT_MODULE_DEPENDS_IOS ${swift_distributed_darwin_dependencies}
   SWIFT_MODULE_DEPENDS_OSX ${swift_distributed_darwin_dependencies}
   SWIFT_MODULE_DEPENDS_TVOS ${swift_distributed_darwin_dependencies}

stdlib/public/Synchronization/CMakeLists.txt

@@ -41,6 +41,14 @@ if(SWIFT_BUILD_SDK_OVERLAY)
   set(SWIFT_SYNCHRONIZATION_DARWIN_DEPENDENCIES Darwin)
 endif()
 
+set(SWIFT_SYNCHRONIZATION_DEPENDENCIES)
+if((SWIFT_BUILD_CLANG_OVERLAYS
+    OR SWIFT_BUILD_TEST_SUPPORT_MODULES)
+   AND (NOT DEFINED SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT
+        OR NOT SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT))
+  set(SWIFT_SYNCHRONIZATION_DEPENDENCIES _Builtin_float)
+endif()
+
 set(SWIFT_SYNCHRONIZATION_DARWIN_SOURCES
   Mutex/DarwinImpl.swift
   Mutex/Mutex.swift
@@ -104,6 +112,8 @@ add_swift_target_library(swiftSynchronization ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES
   SWIFT_SOURCES_DEPENDS_FREESTANDING
     Mutex/MutexUnavailable.swift
 
+  SWIFT_MODULE_DEPENDS
+    ${SWIFT_SYNCHRONIZATION_DEPENDENCIES}
   SWIFT_MODULE_DEPENDS_OSX
     ${SWIFT_SYNCHRONIZATION_DARWIN_DEPENDENCIES}
   SWIFT_MODULE_DEPENDS_IOS

test/SILGen/typed_throws_generic.swift

@@ -387,3 +387,10 @@ extension ReducedError where T == MyError {
     throw MyError.fail
   }
 }
+
+// https://github.com/swiftlang/swift/issues/74289
+struct LoadableGeneric<E>: Error {}
+
+func throwsLoadableGeneric<E>(_: E) throws(LoadableGeneric<E>) {
+  throw LoadableGeneric<E>()
+}