Nate Chandler 6ccd08b4e0 Merge branch 'main' into rebranch. ...

Resolve conflicts introduced in
https://github.com/apple/swift/pull/67944 as follows:

```
diff --git a/include/swift/Runtime/RuntimeFunctions.def b/include/swift/Runtime/RuntimeFunctions.def
index 3c973b5884b..44cde707d17 100644
--- a/include/swift/Runtime/RuntimeFunctions.def
+++ b/include/swift/Runtime/RuntimeFunctions.def
@@ -2537,16 +2537,10 @@ FUNCTION(AutoDiffCreateLinearMapContextWithType,
          swift_autoDiffCreateLinearMapContextWithType, SwiftCC,
          DifferentiationAvailability,
          RETURNS(RefCountedPtrTy),
-<<<<<<< HEAD
-         ARGS(SizeTy),
+         ARGS(TypeMetadataPtrTy),
          ATTRS(NoUnwind),
          EFFECT(AutoDiff),
          MEMEFFECTS(ArgMemOnly))
-=======
-         ARGS(TypeMetadataPtrTy),
-         ATTRS(NoUnwind, ArgMemOnly),
-         EFFECT(AutoDiff))
->>>>>>> public-github/main

 // void *swift_autoDiffProjectTopLevelSubcontext(AutoDiffLinearMapContext *);
 FUNCTION(AutoDiffProjectTopLevelSubcontext,
@@ -2563,16 +2557,10 @@ FUNCTION(AutoDiffAllocateSubcontextWithType,
          swift_autoDiffAllocateSubcontextWithType, SwiftCC,
          DifferentiationAvailability,
          RETURNS(Int8PtrTy),
-<<<<<<< HEAD
-         ARGS(RefCountedPtrTy, SizeTy),
+         ARGS(RefCountedPtrTy, TypeMetadataPtrTy),
          ATTRS(NoUnwind),
          EFFECT(AutoDiff),
          MEMEFFECTS(ArgMemOnly))
-=======
-         ARGS(RefCountedPtrTy, TypeMetadataPtrTy),
-         ATTRS(NoUnwind, ArgMemOnly),
-         EFFECT(AutoDiff))
->>>>>>> public-github/main
```

2023-08-24 16:24:32 -07:00

..

AccessibleFunction.h

Spelling include (#42616)

2022-04-25 09:00:59 -07:00

Atomic.h

Runtime: add MSVC architecture spelling (NFCI)

2023-07-10 08:37:19 -07:00

AtomicWaitQueue.h

[Threading] Create new threading library and use it.

2022-06-07 07:39:51 +01:00

Backtrace.h

[Backtracing] Use stderr by default unless interactive.

2023-06-07 13:54:36 +01:00

Bincompat.h

Provide a Bincompat override for the newly tightened casting semantics

2023-02-02 08:45:50 -08:00

BuiltinTypes.def

[Executors][Distributed] custom executors for distributed actor (#64237)

2023-03-15 23:42:55 +09:00

Casting.h

[Runtime][IRGen] Sign type context descriptor pointers.

2023-07-07 18:10:35 -04:00

CMakeConfig.h.in

Base override section names on swift version

2023-02-15 19:43:57 -08:00

CMakeLists.txt

[CMake] Also treat builds in Playgrounds trains as "Xcode" builds.

2021-11-18 16:08:24 -08:00

Concurrency.h

[Concurrency] SerialExecutor.isSameExclusiveExecutionContext (#64604)

2023-03-28 15:56:28 +09:00

Concurrent.h

Runtime: Remove linear order on metadata cache keys

2023-03-02 10:22:11 -05:00

Config.h

[Runtime][IRGen] Sign type context descriptor pointers.

2023-07-07 18:10:35 -04:00

CrashInfo.h

[Backtracing][Linux] Tidy a few things up after review.

2023-06-06 16:06:21 +01:00

CustomRRABI.h

[Runtime] Fix warnings in CustomRRABI when building for ARM64_32.

2022-12-15 17:04:44 -05:00

Debug.h

[Backtracing][Linux] Add Linux crash handler to the runtime.

2023-06-05 15:39:50 +01:00

DispatchShims.h

Stop using SWIFT_STDLIB_SINGLE_THREADED_CONCURRENCY under SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY (#62735)

2023-01-03 15:24:57 -08:00

Enum.h

[IRGen+Runtime] Add layout string support for generic single payload enums (#66791)

2023-06-20 20:46:54 -07:00

EnvironmentVariables.h

[Backtracing] Add support for looking up paths for auxiliary executables.

2023-03-01 13:43:15 +00:00

Error.h

…

Exclusivity.h

[Backdeploy5.6] Hide task_future_wait[_throwing]

2022-10-12 16:23:40 -07:00

ExistentialContainer.h

[next] Remove LLVM_ATTRIBUTE_DEPRECATED

2022-05-05 16:25:10 -07:00

FoundationSupport.h

…

FunctionReplacement.h

…

Heap.h

Adopt malloc_type for allocating Swift objects from runtime (#63226)

2023-02-02 17:08:41 -08:00

HeapObject.h

[Runtime] Temporarily update attribute ordering

2022-12-18 11:18:16 -08:00

InstrumentsSupport.h

gardening: make c++98-compat-extra-semi an error

2021-11-27 11:40:17 -08:00

Metadata.h

Use an i32 argument instead of size

2023-08-15 19:49:44 -07:00

Numeric.h

…

ObjCBridge.h

…

Once.h

[Threading] Create new threading library and use it.

2022-06-07 07:39:51 +01:00

Paths.h

[Backtracing] Change the return type of one of the paths functions.

2023-03-01 19:08:08 +00:00

Portability.h

…

Reflection.h

…

RuntimeFnWrappersGen.h

[rebranch] Correct read only argument memory and apply in getRuntimeFn

2023-08-10 22:03:50 -07:00

RuntimeFunctions.def

Merge branch 'main' into rebranch.

2023-08-24 16:24:32 -07:00

SwiftDtoa.h

Spelling include (#42616)

2022-04-25 09:00:59 -07:00

VoucherShims.h

Stop using SWIFT_STDLIB_SINGLE_THREADED_CONCURRENCY under SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY (#62735)

2023-01-03 15:24:57 -08:00

Win32.h

Make the UTF8-to-wide functions into SPI rather than internal.

2022-12-21 15:27:21 +00:00