Manually merge branch 'main' into rebranch #81352
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
Remove a workaround for the ARM64 toolchain when built with mimalloc which would previously have an erroneous reference to the x64 interceptor.
These are discussed in the lifetime annotations pitch: swiftlang/swift-evolution#2750 Addresses rdar://150400414
This will ensure all the test executables generated by `check-*` targets can run on the current machine. Addresses rdar://150469492
Importing C++ class templates in symbolic mode has proven to be problematic in interaction with other compiler features, and it isn't used widely. This change removes the feature. rdar://150528798
If a module has the same `public-module-name` as the module being generated and its import is exported, merge it into the same generated interface. Fix various always-imported modules from being printed while here and update all the tests that checked for them. Resolves rdar://137887712.
This header was supposed to be deleted by swiftlang#63783.
…stream LLVM This attribute was introduced in 7eca38ce76d5d1915f4ab7e665964062c0b37697 (llvm-project). Match it using a wildcard regex, since it is not relevant to these tests. This is intended to reduce future conflicts with rebranch.
… upstream LLVM The current pattern does not match a ')' inside the argument list. This will no longer work because `nocapture` became `captures(none) in 29441e4f5fa5f5c7709f7cf180815ba97f611297 (llvm-project). Use a wildcard regex instead. Doing so does not compromise the test because the `unnamed_addr` attribute we are guarding against can appear only after the argument list. This is intended to reduce future conflicts with rebranch.
…te in upstream LLVM The parameter attribute was introduced in 5ece35df8586d0cb8c104a9f44eaae771de025f5 (llvm-project) and is expected here according to the lowered function bodies. Match it using a wildcard regex, since it is not relevant to these tests. This is intended to reduce future conflicts with rebranch.
…in upstream LLVM The `captures(ret: address, provenance)` parameter attribute is expected because these functions either immediately return the pointer argument or pass it as an argument to another such parameter. See https://llvm.org/docs/LangRef.html#parameter-attributes. Match it using a wildcard regex, since it is not relevant to these tests. This is intended to reduce future conflicts with rebranch.
…pstream LLVM The attribute is `range(i8 -127, -128)`. The documentation specifies that the range can wrap, meaning that for i8 [-127, -128) is equivalent to [-127, 127). This is expected for a function that simply increments a i8 value. See https://llvm.org/docs/LangRef.html#parameter-attributes. Match it using a wildcard regex, since it is not relevant to this test. This is intended to reduce future conflicts with rebranch.
…in upstream LLVM `alias nocapture swiftself` -> `alias swiftself captures(none)`. `nocapture` became `captures(none)` in 29441e4f5fa5f5c7709f7cf180815ba97f611297 (llvm-project). This is intended to reduce future conflicts with rebranch.
The use of SendableCompletionHandlers here is completely incidental, because it happened to be introduced at roughly the same time as the bits we needed for MutableSpan. Fixes rdar://148072153.
Since we enabled parallel dependency scanning by-default, each individual scan needs a diagnostic consumer that is safe to use across many threads. Deprecate the 'Locking' sub-class, making its behavior the default in the base class.
…ic collection All clients are expected to have switched to the per-scan-query diagnostics using 'swiftscan_dependency_graph_get_diagnostics'
…mbolic-mode [cxx-interop] Remove symbolic import mode
... that would import that as a result of importing Darwin from the SDK. Amend my previous change to Differentiation and Distributed in this sense. Addresses rdar://150400049
This reverts commit 99d95aa.
…eam" This reverts commit 06bb718.
…d witnesses If all of the witnesses to a conformance are nonisolated, then infer that conformance as nonisolated rather than global-actor-isolated. This is only relevant when InferIsolatedConformances is enabled, and prevents that inference to help maintain source compatibility.
This request was looking through to the root conformance, which could mess with the caching bits. Sink the "is nonisolated conformance" bit down into ProtocolConformance, and have the request for a non-root conformance be defined in terms of the request for the root conformance.
This assertion will trigger whenever there is a cycle with a split-cached request. Remove the assertion.
LLVM changed both the syntax and relative position of the `nocapture` parameter attribute. I would like to get notified of any changes in this area to make sure new tests match the attribute on main such that it won't cause a conflict with rebranch.
`extension G<Int>` introduces a same-type requirement, and this isn't supported for variadic generic types yet. Make sure we pass a valid source location here to diagnose instead of dropping the error. - Fixes swiftlang#70432 - Fixes rdar://119613080
…itecture-for-runtime-targets-for-darwin compiler-rt: use the current host architecture for the runtime targets
AnthonyLatsis
removed request for
kavon,
xymus,
etcwilde,
rjmccall,
Xazax-hun,
beccadax,
DougGregor,
edymtt,
CodaFi,
adrian-prantl,
shahmishal,
al45tair,
egorzhdan,
ahoppen,
artemcm,
hborla,
j-hui,
zoecarver,
ian-twilightcoder,
hnrklssn,
hamishknight,
eeckstein,
cachemeifyoucan,
tshortli,
fahadnayyar,
susmonteiro and
justice-adams-apple
|
@swift-ci please smoke test macOS |
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.
Resolves minor conflicts with main due to #81257 and #81279.