🌲: Merge branch 'main' into rebranch. #68133
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Unlike the core Set.insert, this utility declaration wasn’t declared @discardableOverload, introducing an undesirable inconsistency. rdar://114008680
This test case used to fail at some point but it’s passing now. Add it so that we don’t break it in the future. rdar://97897857
For LazyImmediate and TupleConformances.
…on builtins (swiftlang#67944) When the differentiating a function containing loops, we allocate a linear map context object on the heap. This context object may store non-trivial objects, such as closures, that need to be released explicitly. Fix the autodiff linear map context allocation builtins to correctly release such objects and not just free the memory they occupy.
…oad-decl [stdlib] Add @discardableResult to Set.insert’s AnyHashable overload
…-relation [CodeCompletion] Add test case for some/any type relations
…lpath Remove realpath in lit site config to fix Driver/working-directory.swift test failure
Improve layout strings runtime code and fix several issues
[Test] Require asserts for some experimental-feature tests.
Resolve conflicts introduced in swiftlang#67944 as follows: ``` diff --git a/include/swift/Runtime/RuntimeFunctions.def b/include/swift/Runtime/RuntimeFunctions.def index 3c973b5884b..44cde70 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 ```
nate-chandler
requested review from
ahoppen,
bnbarham,
rintaro,
hamishknight,
hborla,
slavapestov and
xedin
as code owners
bnbarham
approved these changes
Aug 24, 2023
etcwilde
approved these changes
Aug 24, 2023
The original PR didn't remove any definitions, so it's fine. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolve conflicts introduced in #67944 as follows: